Merge branch 'gh-pages'

* gh-pages:
shrinking logo, scroll to nav
Merge branch 'master' into gh-pages

* master:
  shrinking logo, scroll to nav