try it
Merge branch 'master' of https://github.com/grosalex/ProjetING3S2
there is bug
solving merge conflict and completing the menue