added foo.txt
Merge branch 'master' of github.com:jpr0930/git-testing