Merge branch 'master' of https://github.com/mmi1c1/TP2
Merge pull request #1 from FoulontPaulC2/master

sdfeger
Image GoT
Merge pull request #6 from JustineCressonMMI1C2/master

IMAAAAAAGGGGGEEEEEEUUUHHHHH... Lol :)