Fonctions de vente
Merge branch 'master' of https://github.com/fhamelin/inf1011-tp3

Conflicts:
	Catalogue.java