merge
Merge branch 'master' of https://github.com/wangyif2/4d19
Added stu num and fixed typos