Christof Veraenderungen waehrend Meeting
Christof Kunden Hinzu waehrend Meeting
Oliver Veraenderungen Meeting
Merge branch 'master' of
https://github.com/ChristofTorres/eShop-Server.git

Conflicts:
	eShop Server/src/shop/server/domain/KundenVerwaltung.java
	eShop Server/src/shop/server/net/ClientRequestProcessor.java
	eShop
Server/src/shop/server/persistence/log/FileLogPersistenceManager.java