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

Conflicts:
	test.txt