A提交
Merge branch 'master' of github.com:heavenchou/test2

Conflicts:
	新文字文件2.txt