Combat bug fixed and winning enabled
Merge branch 'master' of https://github.com/CM1101Group8/game