v1
v2
Merge branch 'master' of https://github.com/imrexhuang/git-p3

Conflicts:
	test1.txt