Bunch of shit

cant remember
Merge branch 'master' of https://github.com/majames/club_bizz

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