add a new file test-2.txt
push test
test push
Merge branch 'master' of https://github.com/sorghumfeng/git-test