s
Merge branch 'branch'

Conflicts:
	新文字文件.txt
Merge pull request #1 from kyho4515/master

test