Changed Combat System (Single Target)

Fixed bug so the game will properly end now upon death...
Wrong input handler (ChoiceState & CombatState)
Merge remote-tracking branch 'origin/master' into Bas