change 2.txt
Merge branch 'master' of https://github.com/zhangkf/trygit

Conflicts:
	2.txt