My feature
Merge branch 'bob'
Merge branch 'master' of https://github.com/githubteacher/example-branches