Merge branch 'master' into gh-pages
Changed colors because prior treys looked bad on mac monitor
Merge branch 'gh-pages'
cleaned up some js
Merge branch 'gh-pages'
color