resolution de conflits
Merge branch 'master' of https://github.com/fredmontet/projet_mi