update
123
Merge branch 'gitcafe-pages'

* gitcafe-pages:
  update

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

* gitcafe-pages:
  up