merge <th@zju.edu.cn>'s commit
Merge branch 'master' of github.com:QSCTech/freshman