jump
Merge branch 'master' of https://github.com/ELoevbak/Worms

Conflicts:
	src/worms/model/JumpingObject.java