Test de PierrePoint
Merge branch 'master' of github.com:les-champions/Jeudego

Conflicts:
	nbproject/private/private.properties
	nbproject/private/private.xml