Merge pull request #3 from qini7/assignment3

assignmet3_133071308280_TA
Merge branch 'master' of https://github.com/ds-sww/codebase into assignment3
sdkfsd
13307130309_tangyiqi_assignment4
Merge pull request #1 from ds-sww/master

Update
Merge branch 'master' of https://github.com/ds-sww/codebase into assignment3
assignment4 revised
Assignment5 done.
Add some comments to p2.cpp for easy reading.
assignment5 done
finish assignment5
Assignment5
13307130280_assignment5_OJ
Assignment5 completed
fMerge branch 'master' of https://github.com/qini7/codebase
assignment4_merge
assignment5_master
assignment5_13307130280_OJ_0
commit assignment5
assignment5
commit by 13307130309
a*s 5