modif bouton yes no
modif
Merge branch 'master' of https://github.com/proto3/Manhattan.git

Conflicts:
	Manhattan/options.tablut
Merge branch 'master' of https://github.com/proto3/Manhattan.git
animation reflexion
Merge branch 'master' of https://github.com/proto3/Manhattan.git

Conflicts:
	Manhattan/src/gui/GuiRev1.java
Merge branch 'master' of https://github.com/proto3/Manhattan.git

Conflicts:
	Manhattan/src/graphique/TerrainGraphique.java