rewrote main.js and got all features working, reformatted data file, added extra styling, changed html layout slightly, added script comments. done.
Merge remote-tracking branch 'origin/master'