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