update merge chongrui
Merge pull request #8 from qcxu/qiongcheng

Q