.gitignore
Merge branch 'master' of https://github.com/beijing-acsm/test-project

Conflicts:
	.gitignore