commit pour pull
recommit pour pull...
commit comme ca...
Merge branch 'master' of https://github.com/proto3/Manhattan.git

Conflicts:
	Manhattan/src/types/Case.java
modif de la difficulte moyenne
Merge branch 'master' of https://github.com/proto3/Manhattan.git