Combat

Implimented Combat, started bonuses