I commit
Fixed git merge conflict
Merge branch 'master' of https://github.com/Siretu/shiny-octo-ninja