Merge branch 'gh-pages'
6/2 navbar check 4
Merge branch 'master' into gh-pages