Edited Person2's Method
Merge branch 'master' of https://github.com/nlts/CS2340-M2