nav bar
Merge branch 'master' of github.com:charlyy/Showerthoughts