TryGit
try push and commit
Merge https://github.com/LuYuan81/GitTest

Conflicts:
	testgit.txt