Avancement de la vue
Avancement de la vue
Merge branch 'master' of https://github.com/H4305/DevOO

Conflicts:
	projet/devoo/src/main/java/vue/widget/MainPanel.java