start of grouping
Merge branch 'master' of https://github.com/Ben-Jam/benjam-rails

Conflicts:
	app/controllers/items_controller.rb
Merge branch 'master' of https://github.com/Ben-Jam/benjam-rails