Resolution du conflit
Merge branch 'master' of https://github.com/LesChickens/Camp-Chickens-2015