resoudre conflits
Merge branch 'master' of https://github.com/Kamelly/Projet-C-