first commit
init
update about
666
666
update
fix bugs
h4
update
update
update
post
update baiduID
config
test
UPDATE
update baiduid
update
update 7
Merge branch 'gitcafe-pages'

* gitcafe-pages:
  update 7
  update
  update baiduid
  UPDATE
  test
  config
  update baiduID
  post
  update
  update
  update
  h4
  fix bugs
  update
  666
  666
  update about
  init
  first commit

Conflicts:
	_config.yml
	_includes/tongji.html
	_site/blog/2014/11/24/HelloWorld.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/res/js/light.js
	_site/sitemap.txt
	index.html