new changes
the second commit
Merge branch 'master' of https://github.com/elhaj/projet