Suite Nouvelle map

Fail this.map.render(0,0,4)
Merge remote-tracking branch 'origin/master'

Conflicts:
	Programme/src/main/WindowGame.java
	Programme/src/main/ressources/map/exemple-collision.tmx
	Programme/src/main/ressources/map/exemple-desert.tmx