Mise a la norme 6
Merge branch 'master' of https://github.com/Sirlefou1/GRR2