first commit
 commit it
3
Merge branch 'master' of github.com:wjch/wjch.github.com
ss
Conflicts:
	CNAME
	atom.xml
	blog/2013/04/08/zhong-yu-bu-shu-hao-huan-jing-liao/index.html
	blog/2013/04/15/bashde-kuai-jie-jian-zong-jie/index.html
	blog/2013/04/20/enter-your-password-to-install-the-bundled-rubygems-to-your-systemwen-ti-de-jie-jue/index.html
	blog/2013/04/28/octopressbu-shu-shi-yong-pei-zhi-zong-jie/index.html
	blog/2013/04/28/you-qu-de-linuxming-ling-zong-jie/index.html
	blog/2013/04/29/mybatiswen-ti-,ni-neng-da-dui-ji-ge/index.html
	blog/2013/04/29/rails-bao-cuo/index.html
	blog/2013/04/29/zai-ubuntu13-dot-04zhong-an-zhuang-sublime-text2/index.html
	blog/archives/index.html
	blog/categories/za-xiang/atom.xml
	blog/categories/za-xiang/index.html
	index.html
	sitemap.xml
	stylesheets/screen.css