Essai de * a *
Merge remote-tracking branch 'origin/master'

Conflicts:
	GestResto/GestResto.UI/MainWindow.xaml.cs