lol
asd
Merge branch 'master' of https://github.com/Huschke/E-Shop6.3.3.14.git

Conflicts:
	eShop_projekt/SHOP_Artikel.txt
	eShop_projekt/src/shop/domain/ArtikelListe.java