CombatView2

Finished the combat view and added a find character function