Initial commit
Initial commit
modified:   app/scripts/main.js
Merge branch 'release/threejs-6'

* release/threejs-6:
  modified:   app/scripts/main.js
  Initial commit
Merge remote-tracking branch 'origin/master'

* origin/master:
  Initial commit