mademore tests
Merge branch 'master' of https://github.com/sebastianstoelen/OOP-Worms

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