Merge branch 'master' of https://github.com/iskglad/personnalGitForTesting
Merge branch 'master' of https://github.com/iskglad/personnalGitForTesting

Conflicts:
Untitled.rtf
merge