Adding a pagination
Pagination now handles page_size
Merge branch 'pagination'

* pagination:
  Pagination now handles page_size
  Adding a pagination

Conflicts:
	app/controllers/application_controller.rb