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