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

Conflicts:
	index.html
Site updated at 2013-08-29 17:13:33 UTC