Merge pull request #1 from evildmp/master

testing pull requests
merging from upstream
Merge https://github.com/jensadne/afraid-to-commit