Started part 2
Merge branch 'master' of https://github.com/KevinEmery/csci442project3