2 files changed, 4 insertions, 4 deletions

diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index b98a38e..b9b7892 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -9,10 +9,10 @@ class EventsController < ApplicationController
   # GET /events
   # GET /events.xml
   def index
-    @events = Event.all
+    @events = Event.order(:id)
 
     respond_to do |format|
-      format.html # index.html.erb
+      format.html { @events = @events.paginate(page: params[:page], per_page: 25) }
       format.xml  { render :xml => @events }
     end
   end
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index b6a5b1f..f579fc0 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -2,6 +2,8 @@
 
 <%= link_to 'New event', new_event_path, class: 'action_button' %>
 
+<%= will_paginate @events %>
+
 <table class="events_table">
   <tr class="header">
     <th>Title</th>
@@ -27,5 +29,3 @@
   </tr>
 <% end %>
 </table>
-
-<%= link_to 'New event', new_event_path, class: 'action_button' %>