Merge remote-tracking branch 'liuzong/master'
pass
asdf
asdfasdf
Merge pull request #7 from pinguo-majianguang/master

adsfasdfasdf
pass
Merge pull request #39 from pinguo-fenghaiting/master

冲突解决