add foo.txt
Merge branch 'master' of https://github.com/junjiemao/test_git