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