modification icone son
Merge branch 'master' of https://github.com/proto3/Manhattan.git
icone son
Merge branch 'master' of https://github.com/proto3/Manhattan.git

Conflicts:
	Manhattan/src/graphique/TerrainGraphique.java