Merge branch 'master' into gh-pages
better looking
oops
So many changes

nav responsiveness is working
Merge branch 'gh-pages'