Merge branch 'gitcafe-pages'

* gitcafe-pages:
  update
  update comment
  cname
123
Merge branch 'gitcafe-pages'

* gitcafe-pages:
  update

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

* gitcafe-pages:
  up
Merge branch 'gitcafe-pages'

* gitcafe-pages:
  十个美梦
  baidu verify
  fancybox test
  up
  update
  update
  update comment
  cname
  test
  cname
  test
  not a bug
  test
  fancybox
  "  It's feature, it's a not a bug."
  update site
  update baidutongji
Merge branch 'master' of https://github.com/HelKyle/helkyle.github.io

* 'master' of https://github.com/HelKyle/helkyle.github.io:
  123

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

* gitcafe-pages:
  post rapidjson
  test2.gif
  tt
  i
  commit test.gif
  nothing update

Conflicts:
	_site/atom.xml
	_site/sitemap.xml
post 3.xLabelApi
Merge branch 'master' into gitcafe-pages

* master:
  post 3.xLabelApi
  master
  123