Conflits
Merge branch 'master' of https://github.com/MarK9992/Projet-Fin-Semestre

Conflicts:
	Projet-Fin-Semestre/src/managementsystem/Main.java