Finished fusion
Merge branch 'master' of github.com:derdaelj/Projet