Fixed more things
Merge branch 'master' of https://github.com/TheColorMan/Atom-Game