Style changes
Merge branch 'master' of github.com:R42/codebits-quest
Merge from origin/master
Fixes conflicts