制造冲突
Merge branch 'master' of git://github.com/naiyi/test

Conflicts:
	test.txt