#3, #4, #5
#2
Merge branch 'bugfix' of https://github.com/davidhemphill/git-test into bugfix