Octopress init
Merge branch 'master' of https://github.com/bjzhou/bjzhou.github.io

Conflicts:
	index.html
Site updated at 2014-05-26 06:06:50 UTC