add a test.txt
delete test.txt
Merge branch 'master' of github.com:HzyGit/git_test