Merge branch 'Emmanuel'
Merge branch 'master' of https://github.com/SIMNUM/projet_trajectoire