Merge branch 'master' into door-puzzle

Conflicts:
index.html
js/world.js
trying to merge
and one more