ignore
aa
Merge branch 'master' of https://github.com/StephenZhuang/MobileNJU

Conflicts:
	MobileNJU/MobileNJU/首页/Home.storyboard