Popup livraison impossible
Merge branch 'master' of https://github.com/H4305/DevOO
MAJ Diagramme de classe
Merge branch 'master' of https://github.com/H4305/DevOO
diagramme de classe PNG
Merge branch 'master' of https://github.com/H4305/DevOO

Conflicts:
	projet/devoo/src/main/java/controller/Controller.java
	projet/devoo/src/main/java/vue/VueGestionLivraison.java
Merge branch 'master' of https://github.com/H4305/DevOO