second commit
Merge branch 'master' of github.com:1989chenguo/git_test