fix for defender + catcher

bot with a flag is now always made catcher.
Merge remote-tracking branch 'origin/goodworkings' into goodworkings

Conflicts:
	CaptureTheFlag/defenderRules.py