Equilibrages des degats
Merge branch 'master' of https://github.com/Alexisverheyen/BlevurFinal

Conflicts:
	bin/Controller/Controleur.class
	bin/Jeu/Combat.class
	src/Controller/Controleur.java
	src/Jeu/Combat.java
Merge branch 'master' of https://github.com/Alexisverheyen/BlevurFinal