Grosses modifications et gros ajouts.
Merge
Merge+
Merge++
Merge branch 'master' of https://github.com/Kowah/MapBuilder

Conflicts:
	src/Modele/Carte.java
	src/Modele/Ligne.java