moved nav to fixed up top
Merge branch 'master' into gh-pages