Fixed the index.html and cleaned up the main.js
Merge branch 'master' of github.com:mloewent/TriCollide
Merged conflicts in index