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

Conflicts:
	bin/world/objects/ingredients/Sallad.class
	bin/world/objects/projectiles/BananaProjectile.class
	bin/world/objects/projectiles/CheeseProjectile.class
	src/world/objects/projectiles/BananaProjectile.java