试试手动merge
Merge pull request #2 from maogongzi/master

测试手动merge