Octopress init
Site updated at 2014-05-27 16:01:56 UTC
Merge branch 'master' of https://github.com/lijinma/lijinma.github.io

Conflicts:
	atom.xml