Conflits Anthony.
Résolution conflits Anthony.

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

Conflicts:
	Projet-Fin-Semestre/bin/equipment/Equipment.class
	Projet-Fin-Semestre/bin/managementsystem/Main.class