Merge branch 'master' of https://github.com/gchamon/POO-TP2-Q2