Feature: fixed position nav, sticks when scrolling. Also fixed small bug where the page wouldn't reset to scroll:0 on view change
Merge branch 'master' into gh-pages
Merging master into gh-pages