Merge branch 'master' of https://github.com/tillreiter/js_exercise_planet