'init'
Merge branch 'master' of https://github.com/hodor-cn/hodor-cn.github.com