v1.0
Merge branch 'master' of https://github.com/orangeclk/shijing
v1.1