Readme update
Merge branch 'master' into gh-pages
no idea anymore
Correct main.js