update
Merge branch 'master' of https://github.com/GanhuiyouTeam/GanHuiYou

Conflicts:
	GanHuiYou/loginAndReigster/Main.storyboard