Merge branch 'master' of https://github.com/SWEN30006proj/clubbiz

Conflicts:
	test.txt
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/routes.rb