Changed a few variables to public static so they can be used as global game state
Merge branch 'master' of https://github.com/ejbs/indaprojekt