add 3 file
Merge branch 'testBranch' of https://github.com/beijing-acsm/test-project into testBranch

Conflicts:
	Test2/test