Final commit
Merge branch 'master' of github.com:RyanEggert/SoftwareDesign_GameDev