commit #1
Merge branch 'master' of https://github.com/kingllama/git-mania