Merge pull request #26 from chuyu123/master

1020 julie test
1020 joe 提交
Merge branch 'master' of https://github.com/piercalex/m
joe delete
Merge branch 'joe'
Merge pull request #27 from chuyu123/master

add by julie
joe
Merge branch 'master' of https://github.com/piercalex/m
victory
zheli a
Merge pull request #28 from piercalex/joe

zheli a
Merge pull request #1 from piercalex/master

完成了吧