测试github merge
Merge pull request #7 from qiuJinLong/master

测试github merge