edito + nom site
Merge pull request #1 from HernasManon1A1/master

Edito + nom site
article6 modification
Merge pull request #3 from FerroSilviosrc/master

modification article 6
Merge branch 'master' of https://github.com/LemaitreGuillaumeSRC1A1/TP3

Confilts OK
t looks like you may be committing a merge.