made significant changes to index.html, main.css, main.js
Merge remote-tracking branch 'origin/master'