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

Conflicts:
	index.html