a
Merge branch 'master' of https://github.com/wanghuan8086/testGit.git

Conflicts:
	1.txt