a pull test

tests pull
merge test

tests merge
Merge pull request #1 from dalenicholls/pull-test

a merge pull request test