Added Combatant model
Added Combat
Added database associations