edit
Merge branch 'gh-pages' of github.com:Jylhis/Jekyll-blog into gh-pages