phase B - database
Merge branch 'master' of https://github.com/CarolineLebo/project