added merging
removed syso
ignoring bin
moved client source code
Merge branch 'master' of github.com:robert-schmidtke/pcsd

Conflicts:
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/AtomicScan.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/AtomicScanResponse.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/BeginGreaterThanEndException.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/BeginGreaterThanEndException_Exception.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/BulkPut.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/BulkPutResponse.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/Delete.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/DeleteResponse.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/FileNotFoundException.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/FileNotFoundException_Exception.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/IOException.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/IOException_Exception.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/Init.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/InitResponse.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/Insert.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/InsertResponse.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/KeyAlreadyPresentException.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/KeyAlreadyPresentException_Exception.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/KeyImpl.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/KeyNotFoundException.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/KeyNotFoundException_Exception.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/KeyValueBaseImplService.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/KeyValueBaseImplServiceService.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/ObjectFactory.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/Pair.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/Predicate.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/Read.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/ReadResponse.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/Scan.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/ScanResponse.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/ServiceAlreadyInitializedException.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/ServiceAlreadyInitializedException_Exception.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/ServiceInitializingException.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/ServiceInitializingException_Exception.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/ServiceNotInitializedException.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/ServiceNotInitializedException_Exception.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/Update.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/UpdateResponse.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/ValueImpl.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/ValueListImpl.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/client/Client.class
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/client/Client.java
	assignment-1/client/src/dk/diku/pcsd/assignment1/impl/package-info.class