Changed a lot in combat, problem with adding players - we need a plan :)
Merge branch 'master' of http://github.com/senilica/LostVaults

Conflicts:
	client.jar
	server.jar
	src/lostvaults/server/Player.scala