modif classe 2
essai
Merge remote-tracking branch 'origin/master'

Conflicts:
	28mars2014/src/Classe2.java