Attempting part 3
Merge branch 'master' of github.com:firelizzard18/CS310-Project-3