test1
Merge branch 'gitcafe-pages'

* gitcafe-pages: (21 commits)
  test2
  test
  copy files from gitcafe
  update 7
  update
  update baiduid
  UPDATE
  test
  config
  update baiduID
  post
  update
  update
  update
  h4
  fix bugs
  update
  666
  666
  update about
  ...
Merge branch 'master' of https://gitcafe.com/HelKyle/HelKyle

* 'master' of https://gitcafe.com/HelKyle/HelKyle:
  test1
Merge branch 'gitcafe-pages'

* gitcafe-pages:
  test666
post 进阶使用XKPageView
wtf
Merge branch 'master' into gitcafe-pages

* master:
  wtf
  test1

Conflicts:
	_site/HelloWorld/index.html
	_site/Run/index.html
	_site/index.html
	_site/page/about.html
	_site/page/category.html
	_site/page/feed.xml
	_site/page/read.html
	_site/page/timing.html
	_site/sitemap.txt
update