début de résolution de conflit encodage
Merge branch 'master' of https://github.com/geeknbar/projetEDT
Merge branch 'master' of https://github.com/geeknbar/projetEDT
Merge branch 'master' of https://github.com/geeknbar/projetEDT
modification css
Merge branch 'master' of https://github.com/geeknbar/projetEDT