some minor fixes
Merge branch 'group7/develop' into group7/master
Merge branch 'master' of https://github.com/maxfindel/gameworks into group7/master
fixing merge conflict
merging game.java