grejer
Merge branch 'master' of https://github.com/xzgron/HamburgerGame

Conflicts:
	bin/game/parts/GameWorld.class
	src/game/parts/GameWorld.java