Merge pull request #21 from skyyuan/cihui

词汇 全部功能
精华上传修改