made new map
Merge remote-tracking branch 'origin/combatRules' into combatRules