Added a new file.
Merge branch 'master' of https://github.com/josephwegner/git-test
Merge branch 'my_branch'
Merge branch 'master' of https://github.com/josephwegner/git-test