Merge branch 'assignment3'
assignment3 change1 by 13307130150
assignment4 by 13307130150
conflict fix by whimsycwd
Merge branch 'arcticfoxsimon-assignment4'