Les Modifs Ouvrir Fichier et Buttons
Merge branch 'Branche1'
On regle conflit
Merge branch 'master' of https://github.com/Matimo/FinalProject.git

Conflicts:
	FinalProject/src/Projet.java
Merge branch 'master' of https://github.com/Matimo/FinalProject.git

Conflicts:
	FinalProject/src/Projet.java