attemped merge
Merge branch 'master' of https://github.com/sebastianstoelen/OOP-Worms

Conflicts:
	bin/worms/model/Worm.class
	src/worms/model/World.java