Commit #3
Merge branch 'master' of https://github.com/kaihyu/gitdev

Conflicts:
	1.txt