Dessin en diagonal ou position originale
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/Carre.class
	bin/Cercle.class
	bin/Forme.class
	bin/Ligne.class
	bin/Ovale.class
	bin/Rectangle.class
	src/Forme.java
	src/Ligne.java
	src/Rectangle.java