中文错误（UTF-8）
Merge branch 'master' of github.com:skyyuan/xiaomalx into login1
Merge pull request #4 from skyyuan/login1

中文错误