removed unnecessary whitespace
fixed ATT calculation in attack() from branch temp
added attack and defence actions from branch temp
fixed some errors with merge of combat.py, added new test_combat_actions.py