merge conflict
Merge branch 'master' of https://github.com/grosalex/ProjetING3S2
setting the stuff about button in table
correcting bugs with the left panel