Merge branch 'gh-pages'
main nav links bugfix
Merge branch 'master' into gh-pages