modified:   ziwei.rb
Merge branch 'master' of github.com:tensaix2j/xuanxue