update functions, debugging
Merge branch 'master' of https://github.com/grosalex/ProjetING3S2