reglages player
commit quentin fix conflict
Merge branch 'master' of https://github.com/nanarchrist/Coloriseum into ludo