tried some stuff but didn't fix the NullPointerException
Merge branch 'master' of https://github.com/1j4k7/WallopsGame.git