Merge branch 'master' into feature/character-rig

package.json

src/assets/README.md

src/assets/aframe.js

src/components/character-controller.js

src/room.js

src/utils/webgl.js

templates/room.hbs

webpack.dev.js

yarn.lock