commit oublié
Merge branch Survivor

Conflicts:
	src/elements/Garde.java