je fais des modif stylées
Merge branch 'master' of https://github.com/AntoineJover/TPDEOUF

Conflicts:
	TP2/src/Jak/CaseMur.java
	TP2/src/Paul/Labyrinthe.java