propriétés ignorees
Merge branch 'master' of https://github.com/Ariekor/TheWoManProjectII

Conflicts:
	Eshoppe/src/eshoppe/Catalogue.java