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

Conflicts:
	SCUTClubManager/DAL/SCUTClubContext.cs
	SCUTClubManager/Models/ClubMember.cs