plz work
Merge branch 'group_stuff'

Conflicts:
	config/routes.rb