gemfile kaminari
Merge branch 'master' of https://github.com/Cohort-7/crowdfundr
Merge branch 'master' of https://github.com/Cohort-7/crowdfundr
Merge branch 'master' of https://github.com/Cohort-7/crowdfundr
finaly got infinite scrolling working
Merge branch 'master' of https://github.com/Cohort-7/crowdfundr
Merge branch 'infinite_scroll'

Conflicts:
	app/controllers/categories_controller.rb
	app/views/categories/index.html.haml
	app/views/categories/show.html.haml
nothing changed
fixed indentations
git rid of extra select tab from category index page
fixed the merge