Octopress init
Site updated at 2013-10-21 12:56:54 UTC
Merge branch 'master' of github.com:chouqin/chouqin.github.io

Conflicts:
	atom.xml
	index.html