Fixing navbar negative margin glitch

Fixes #16
Merge remote-tracking branch 'origin/master' into gh-pages