Résolution de conflit
Modif gitignore
Merge branch 'master' of https://github.com/thomn/projet_qcm