Site updated at 2014-11-21 03:22:34 UTC
Site updated at 2014-11-22 02:46:56 UTC
Site updated at 2014-11-22 02:48:36 UTC
Merge branch 'master' of github.com:jicheng1014/jicheng1014.github.io into source

Conflicts:
	blog/categories/app/index.html
	blog/categories/ruby/index.html
	blog/categories/rubyonrails/index.html
	blog/categories/sui-xiang/index.html
	blog/categories/testing/index.html