Added main.js
Added inde
Merge branch 'master' into gh-pages