Fixed whitespace and stuff
Merge branch 'master' of https://github.com/simus-therobot/Labo4