testouille
Merge remote-tracking branch 'origin/master'

Conflicts:
	Commande/Commande.h
	UML.layout