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

Conflicts:
	index.html