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

Conflicts:
	bin/game/GSprite.class
	bin/game/parts/GameWorld.class
	bin/world/ArmorBar.class
	bin/world/DisplayBar.class
	bin/world/HealthBar.class
	bin/world/WorldObject.class
	src/game/GSprite.java
	src/world/DisplayBar.java