Combat

Added Combat to Main Window and worked on removing combatant.

Combatant Add Dialog is next.