Create test.txt
Create test2.txt
Merge pull request #2 from jbtester/patch-1

Create test2.txt
Merge pull request #1 from jbtester/0.10

Create test.txt
Merge remote-tracking branch 'upstream/master'