more styling changes
Merge branch 'master' of https://github.com/Ben-Jam/benjam-rails

Conflicts:
	app/views/items/_group_page.html.erb
Merge branch 'master' of https://github.com/Ben-Jam/benjam-rails
fixing seed