tentation de résoudre le conflit
Merge branch 'master' of https://github.com/Cepheus/L-Systems

Conflicts:
	src/ATuin/Drawer.java
Merge branch 'master' of https://github.com/Cepheus/L-Systems

Conflicts:
	src/ATuin/Drawer.java
je fais de la merde
Merge branch 'master' of https://github.com/Cepheus/L-Systems

Conflicts:
	src/ATuin/Drawer.java
	src/ATuin/Turtle.java
MàJ de laGUI, reste un bug