add navbar
Merge branch 'gh-pages'
Merge branch 'gh-pages' into master
merged
Merge branch 'master' into gh-pages