Hopefullt fixed merge-hell on binary files.
Merge branch 'master' of https://github.com/senilica/LostVaults

Conflicts:
	client.jar
	server.jar