mufuture 修改
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	绗竴涓汉.txt
Merge branch 'master' of https://github.com/allenwtl/the--name-of--Chinese
myfuture

Signed-off-by: allen <wtljiayou@163.com>
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	绗竴涓汉.txt

Signed-off-by: allen <wtljiayou@163.com>
Merge pull request #4 from myFuture/master

验证confict 合并