整理project
Merge branch 'master' of https://github.com/StephenZhuang/MobileNJU

Conflicts:
	.gitignore