Octopress init
Site updated at 2014-01-16 02:42:49 UTC
update
Merge branch 'master' of https://github.com/xinqiyang/xinqiyang.github.com

Conflicts:
	404.html
	about-xinqiyang/index.html
	ambitions/index.html
	atom.xml
	blog-update/index.html
	blog/2013/11/05/blog-update/index.html
	blog/2013/11/05/first/index.html
	blog/2013/11/07/markdown-learn/index.html
	blog/2013/11/07/start-cdh4-dot-4/index.html
	blog/2013/11/13/my-ios-app/index.html
	blog/2013/11/13/sui-sui-nian/index.html
	blog/2013/11/23/openresty-third-party-modules/index.html
	blog/2013/12/11/spark-on-yarn/index.html
	blog/2014/01/08/chi-dao-de-nian-zhong-zong-jie-2013/index.html
	blog/2014/01/16/2014nian-zhan-wang/index.html
	blog/archives/index.html
	blog/categories/bigdata/atom.xml
	blog/categories/bigdata/index.html
	blog/categories/blog/atom.xml
	blog/categories/blog/index.html
	blog/categories/default/atom.xml
	blog/categories/default/index.html
	blog/categories/tech/atom.xml
	blog/categories/tech/index.html
	index.html
	sitemap.xml
	todolist/index.html