Début journée
Merge branch 'master' of https://github.com/LeonardoALARCON/progr3

Conflicts:
	Persistance/.classpath
	Persistance/Script.sql
Merge branch 'master' of https://github.com/LeonardoALARCON/progr3
Début journée
Merge branch 'master' of https://github.com/LeonardoALARCON/progr3

Conflicts:
	BD/db-derby-10.10.1.1-bin/bin/derby.log
	Persistance/.settings/org.eclipse.jdt.core.prefs
Ajouté des tests
Merge branch 'master' of https://github.com/LeonardoALARCON/progr3
Ajouté des tests
fin journée