from gmail
correct conflict
this is the last commit
Merge pull request #11 from Halim1989/master

si ça marche donc je commence a comprendre