fixed routing, now that i pushed to gh pages
Merge branch 'master' into gh-pages