signup
Merge branch 'master' of https://github.com/jiaoyuguanjia/jygj-ios

Conflicts:
	jygj/ui/student/SignupVIew.m
Merge branch 'master' of https://github.com/jiaoyuguanjia/jygj-ios