Octopress init
Merge branch 'master' of github.com:yuanweicn/yuanweicn.github.com

Conflicts:
	index.html
for index
Site updated at 2013-07-04 14:24:58 UTC