Merge branch 'master' of https://github.com/doodlegoo/ift287-tp2