Revert "Revert "Merge branch 'master' of https://github.com/fredmontet/projet_mi""

This reverts commit f68ceb3496725d7c15edd93441db00c5969b28ed.