Merge remote-tracking branch 'origin/BrancheMenu' into BrancheMenu

Conflicts:
	Travail Final/Travail Final.v12.suo
	Travail_Final/Travail Final/Travail Final.sdf

Rien changer

Je pouvais pas changer de branche !
Merge remote-tracking branch 'origin/BrancheMenu' into BrancheMenu

Conflicts:
	Travail_Final/Travail Final/Travail Final.sdf
	Travail_Final/Travail Final/Travail Final.v12.suo