改到最新版，选项为五个
Merge branch 'master' of git@github.com:XuYankang/kp2012_zju.git