update
update
update
Merge branch 'master' of https://github.com/clotildeguinard/BasicStorageServer

Conflicts:
	bin/.gitignore
	src/common/messages/KVMessageImpl.java