Merge
Merge 2
Merge branch 'master' of https://github.com/ChristofTorres/eShop.git

Conflicts:
	src/shop/local/domain/KundenVerwaltung.java
	src/shop/local/valueobjects/Rechnung.java