Update README.md
Merge branch 'gh-pages'
changed main.js
Merge branch 'master' into gh-pages