fix
Merge branch 'gh-pages' into gitcafe-pages