Comments done. Need prettying up though.
Merge branch 'master' of https://github.com/Shuliyey/ClubBiz.git

Conflicts:
	config/routes.rb