Commit temp pour résoudre un conflit
Merge remote-tracking branch 'origin/master'

Conflicts:
	TacticalRPG/src/arena/game/GameLevelOne.java
	TacticalRPG/src/arena/graphics/SwordVisual.java