remove conflicts
Merge branch 'master' of github.com:codemy/fett
remove log