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

Conflicts:
	index.html
Site updated at 2014-08-20 07:04:55 UTC