Changes from Oliver
Some changes
some changes
MitarbeiterGUI
Merge branch 'master' of https://github.com/ChristofTorres/eShop.git

Conflicts:
	src/shop/local/ui/cui/ShopClientCUI.java