Ajout de catalogue, facture et vente
Merge branch 'master' of https://github.com/fhamelin/inf1011-tp3

Conflicts:
	Article.java
	Main.java
	Vente.java