Class Home OK, Affichage OK
Merge remote-tracking branch 'origin/master'

Conflicts:
	tp0/.classpath