Merge branch 'master' into gh-pages
Merge branch 'master' of github.com:ArondeParon/jekyll-test into gh-pages
Added url prefix
Merge branch 'gh-pages'
Removed prefix again