Update

Made changes to html and main.js file.  Functionality is 0 right now.
Merge branch 'master' into gh-pages