VsTest
Merge branch 'master' of https://github.com/zybmajia1/GitTest

Conflicts:
	.gitignore