.
Merge branch 'master' of https://github.com/tazzcoco/projet-le-bon2

Conflicts:
	nbproject/private/private.xml