asd

asdf
Merge branch 'master' of https://github.com/firedragonpzy/hexo

Conflicts:
	public/2013/12/12/hexo-guide-1/index.html
	public/2013/12/12/hexo-guide-2/index.html
	public/2013/12/13/hexo-guide-3/index.html
	public/2013/12/13/hexo-guide-4/index.html
	public/2013/12/16/Candy Crush 娓告垙鍒朵綔鍙婃秷闄ょ畻娉曞垎鏋?index.html
	public/2013/12/18/Candy Crush 娓告垙鍒朵綔娉ㄦ剰浜嬮」/index.html
	public/about/index.html
	public/archives/2013/12/index.html
	public/archives/2013/index.html
	public/archives/index.html
	public/atom.xml
	public/categories/cocos2d-x/index.html
	public/categories/hexo/index.html
	public/index.html
	public/page/2/index.html
	public/tags/cocos2d-x/index.html
	public/tags/hexo/index.html