Merge branch 'master' into gitcafe-pages

* master:
  fix category
add guestPic
wtf
Merge branch 'gitcafe-pages'

* gitcafe-pages:
  add guestPic

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