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