Bug 1007031 - add foo.txt
Bug 1007018 - merge pull request #1 from autolander:branch1 to autolander:master