Merge branch 'master' into gh-pages
updating baseurl in nav
Merge branch 'gh-pages'