fwliu review
Merge branch 'master' of https://github.com/Williamgood/Lab6CodeReview