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