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

Conflicts:
	bin/worms/model/Facade.class
	bin/worms/model/IFacade.class