123
Merge branch 'gitcafe-pages'

* gitcafe-pages:
  123

Conflicts:
	_site/atom.xml
	_site/sitemap.xml