l
Merge branch 'master' of
https://github.com/NKabaHoutain/projet_appSinf.git

Conflicts:
	Quarto/src/quarto/constante/Constante.java