Merge branch 'master' of https://github.com/caronpe/dessinvectoriel into tmp

Conflicts:
	controler/Controler.java
	fenetre/MenuG.java
	model/Model.java
Petites corrections suite à un merge
Merge branch 'master' of https://github.com/caronpe/dessinvectoriel into tmp

Conflicts:
	controler/Controler.java
	fenetre/MenuG.java
	model/Model.java
Suppression de fichiers redondants