# de confirmation
Merge branch 'master' of https://github.com/daren511/DebarasBoileau

Conflicts:
	src/java/Panier/Panier.java