Conflit
Merge branch 'master' of https://github.com/secu2/miage_projet_framework.git