Nothing
Merge branch 'master' of https://github.com/ChocolateEleven/SCUT-Club-Management-System

Conflicts:
	SCUTClubManager.v11.suo