add FOUR in foo.txt - 3
Merge branch 'master' of github.com:yubai/git_test