6/2 navbar change 5
6/2 navbar double augh
6/2 style change and more navbar
Merge branch 'master' into gh-pages