update test2
Merge branch 'master' of github.com:yizhi/testgit

Conflicts:
	test2.txt