Merge branch 'combat'

diff --cc Player.py
index 3a94e89622819c39b7629fc1f2635c8c7ccc24d2,7da179402a14919aabcef9b364e983a8654fb0ff..e68021030741db005ce156707bad92e56eee6a22
--- 1/Player.py
--- 2/Player.py
+++ b/Player.py
@@@ -5,7 -8,10 +5,8 @@@ from Actors import Acto
  from datetime import datetime, timedelta
  from Potion import Potion
  from Weapon import Melee
 -from CommonImports.colours import red, white
 -from Function.createText import createText
  
+ 
  class Player(Actor):
      scale = 100
      factor = 640 / scale