change start position
add combat
Merge branch 'master' of https://github.com/mtrupkin/console-lib

Conflicts:
	src/main/resources/maps/object-1.xp
	src/main/scala/model/World.scala