commit msg
another commit
Merge pull request #1 from mattraby/feature2

commit msg