com
conflicts
Merge branch 'Sprint2B' of github.com:sephys/ProjetLondon into Sprint2B