header
update about
12
Merge branch 'gitcafe-pages'

* gitcafe-pages:
  update about
  header

Conflicts:
	_site/atom.xml
	_site/sitemap.xml
about
Merge branch 'gitcafe-pages'

* gitcafe-pages:
  about