je c pas se que je suis entrain de faire
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
sound fini
Merge branch 'master' of https://github.com/proto3/Manhattan.git
fin sound