fixes conflicts
Merge branch 'master' of github.com:Codystringham/golfcrony

Conflicts:
	app/controllers/groups_controller.rb