ok
Merge branch 'master' of github.com:barhama/Projet-fin-d-annee

Conflicts:
	gestionCommande/facture1.c