Create cl2.txt
Create bp1.txt
Create bp2.txt
Merge pull request #4 from clytwynec/feature-branch

Create cl2.txt
Merge pull request #6 from benpatterson/sub-feature-branch

Create bp1.txt
Update bp2.txt
Merge pull request #7 from benpatterson/feature-branch

Feature branch