Stopping conflicts
Merge branch 'master' of github.com:ProjetPWEB/Projet
Merge branch 'master' of github.com:ProjetPWEB/Projet
Merge branch 'master' of github.com:ProjetPWEB/Projet
Merge branch 'master' of github.com:ProjetPWEB/Projet
Merge branch 'master' of github.com:ProjetPWEB/Projet
Fuck le select