desperate 4am changes
Merge branch 'master' of heroku.com:groupshare

Conflicts:
	config/routes.rb