Conflits
Résolution conflits

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

Conflicts:
	Projet-Fin-Semestre/bin/controller/AccountController$OkListener.class
	Projet-Fin-Semestre/bin/controller/AdministratorController$AcceptListener.class
	Projet-Fin-Semestre/bin/controller/AdministratorController$AlgorithmListener.class
	Projet-Fin-Semestre/bin/controller/AdministratorController$BackListener.class
	Projet-Fin-Semestre/bin/controller/AdministratorController$SimulationListener.class
	Projet-Fin-Semestre/bin/controller/AdministratorController$StatisticsListener.class
	Projet-Fin-Semestre/bin/controller/AdministratorController.class
	Projet-Fin-Semestre/bin/controller/AlgorithmController$LoansListener.class
	Projet-Fin-Semestre/bin/controller/AlgorithmController.class
	Projet-Fin-Semestre/bin/controller/BorrowerController.class
	Projet-Fin-Semestre/bin/controller/BorrowingController$BorrowListener.class
	Projet-Fin-Semestre/bin/controller/BorrowingController$CancelListener.class
	Projet-Fin-Semestre/bin/controller/LoansHistoryController$OkListener.class
	Projet-Fin-Semestre/bin/controller/LoansHistoryController.class
	Projet-Fin-Semestre/bin/controller/SimulationController$LoansListener.class
	Projet-Fin-Semestre/bin/controller/SimulationController.class
	Projet-Fin-Semestre/bin/equipment/Equipment.class
	Projet-Fin-Semestre/bin/managementsystem/Main.class
	Projet-Fin-Semestre/bin/view/LoansHistoryView.class
	Projet-Fin-Semestre/src/controller/BorrowerController.java