finished resolve conflict
Merge branch 'master' of github.com:evildmp/afraid-to-commit