Merge branch 'gh-pages'
Merge branch 'gh-pages'
beginning design overhaul

initial tweaks
Merge branch 'master' into gh-pages