commit before resolving conflits
solved-conflits
solved conflits
Merge pull request #21 from CarolineCC/home-design

Home design validé!