changed my email address
Merge branch 'master' of github.com:evildmp/afraid-to-commit into some-new-branch
Merge pull request #19 from evildmp/some-new-branch

Some new branch
Merge branch 'master' of https://github.com/evildmp/afraid-to-commit into erikas-branch