Merge branch 'master' into backtrack

Want to replace master with backtrack.
Added index.html, and edited web.js