Changed to relative links
Merge branch 'master' into gh-pages
Changed to local origin