Merge origin/master

Conflicts:
	src/Images.java
	src/JumpCar.java
	src/World.java