Two
Two
Two 2
Merge branch 'master' of https://github.com/kaihyu/gitdev

Conflicts:
	1.txt
	2.txt
	3.txt