ali edits
merge conflict to solve
nother commit
Merge pull request #2 from baraabourghli/ali-new-branch

ali edits
kelvin first commit
merge conflict