上传第一个版本
Merge branch 'master' of github.com:jingshouyan/phonecat

this is just a test how to use git