Appli presque fini
Merge branch 'master' of https://github.com/CesiExiaAdriThibJerem/ProjetJavaGitHup

Conflicts:
	src/configuration/Main.java
	src/simulationInterface/AffichageStats.java
	src/simulationMetier/Donjon.java