Combat added
placed enemies
previouslocation added
Merge branch 'master' of https://github.com/CM1101Group8/game

Conflicts:
	map.py