and
Merge branch 'master' of https://github.com/flieterzusters/OGPjuist

Conflicts:
	OGP1314-Worms-Part1/bin/worms/model/Facade.class
	OGP1314-Worms-Part1/bin/worms/model/World.class