Merge branch 'master' of https://github.com/SWEN30006proj/clubbiz
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/layouts/application.html.erb
	log/development.log