Fixed stuff
Merge branch 'master' of github.com:xavierm02/Projet-M1