text
Merge branch 'my-branch'
Merge branch 'master' into my-branch
Merge pull request #4 from epwalsh/my-branch

My branch