Fixed syntax errors.
Merge branch 'master' of github.com:adairdavid/SENG403G1
Added simple pagination. Needs formatting and dynamic #.
Added 100 users
Merge branch 'add_pagination' into exp

Conflicts:
	Gemfile
Added more pagination.
Merge branch 'master' into exp

Conflicts:
	Gemfile.lock
Gemfile shit.
The seed file now populated the properly adding a bunch of users authors and items
Merge branch 'master' of http://github.com/adairdavid/SENG403G1
Merge remote-tracking branch 'origin/master' into filter-search-master-expr

Conflicts:
	app/controllers/users_controller.rb
	app/views/users/index.html.erb