Gestion conflit
Merge branch 'master' of https://github.com/ScaY/CasseBrique.git