Merge
Merge branch 'master' of https://github.com/RainbowLyte/JavaWood

Conflicts:
	src/gestion/Simulation.java
	src/gestion/algorithme/Algorithme.java