Punctuation
A feature commit
Another commit
Merge branch 'a-feature-branch' of git://github.com/sgravrockdf/pr-test into sgravrockdf-a-feature-branch

Conflicts:
	README.md
More stuff
Another commit
Merge branch 'master' into steve-feature-2