test
utf8
2
Merge branch 'master' of https://github.com/wanhaotzyy/git0413-2

Conflicts:
	test.txt