review for lab6
Merge branch 'master' of ssh://github.com/dsmith20/Lab6CodeReview