Merge branch 'gitcafe-pages'

* gitcafe-pages:
  update
update about page
Merge branch 'master' into gitcafe-pages

* master:
  update about page