jerome : 3eme commit
Merge branch 'master' of
ssh://git@github.com/jeromehubner/Gribouille-projet.git

Conflicts:
	Gribouille Projet/src/core/ClassTest.java