update
Merge branch 'master' of https://github.com/Gwillald/epitech-rush1