.
Merge remote-tracking branch 'origin/master'

Conflicts:
	ProyectLeMoulin/Epicerie.Designer.cs
Merge branch 'master' of https://github.com/chefjuanpi/ProyectLeMoulin

Conflicts:
	ProyectLeMoulin/Epicerie.Designer.cs
Merge remote-tracking branch 'origin/master'

Conflicts:
	ProyectLeMoulin/Epicerie.Designer.cs