Fixing stuff
Merge branch 'master' of https://github.com/Ha1fDead/comsci472_graphics.git
Finished game logic