Merge branch 'master' into gh-pages
made navbar inverse again
Resized
Redesigned
Merge branch 'gh-pages'