Camiel did a mess
Merge remote-tracking branch 'remotes/origin/testmodule' into testmodule

Conflicts:
	BWAPI_4.0.0/DesolatorModule/DesolatorModule.sdf
Removed goddamned file