Stuff
Resolve conflict
Merge branch 'master' of https://github.com/FChapeau/TP2_Drouin_Roy