Changes from CHristof
Changes from Christof
Merge branch 'master' of https://github.com/ChristofTorres/eShop.git

Conflicts:
	src/shop/local/persitence/FilePersistenceManager.java
	src/shop/local/valueobjects/Rechnung.java
Add gibArtikel(int)
Aenderung waehrend Versammlung
Meeting changes
erg
KundenExistiertNichtException eingebaut
adfadf
Merge branch 'master' of https://github.com/ChristofTorres/eShop.git

Conflicts:
	EinAuslagerung.log
	SHOP_A.ser
	SHOP_K.ser
	src/shop/local/domain/KundenVerwaltung.java
	src/shop/local/domain/WarenkorbVerwaltung.java
	src/shop/local/domain/exceptions/KundeExistiertNichtException.java
	src/shop/local/ui/cui/ShopClientCUI.java
	src/shop/local/valueobjects/WarenkorbArtikel.java