Combat is working in a buggy way, but working
Merge branch 'master' of http://github.com/senilica/LostVaults

Conflicts:
	client.jar
	server.jar