update
update
Merge branch 'master' of https://github.com/sdhost/DistributedDatabase

Conflicts:
	src/Client/ClientGUI.java