Events are now lined to a club on creation (through club show page)
Merge branch 'master' of https://github.com/mcaples/clubhouse

Conflicts:
	app/views/clubs/show.html.erb
Clean up