Merge branch 'gh-pages'
Add relative permalinks
Merge branch 'master' into gh-pages