Commit
Merge branch 'master' of https://github.com/rli99/ClubBiz

Conflicts:
	app/controllers/events_controller.rb