completed part 2
Merge branch 'master' of https://github.com/douglaschan32167/CS9FProj5