trying to fix issues
Merge branch 'master' of github.com:Gsarault44/carolinap
Merge branch 'master' of github.com:Gsarault44/carolinap
config conflict
Merge branch 'master' of github.com:Gsarault44/carolinap
 homepage
fix conflict
Merge branch 'master' of github.com:Gsarault44/carolinap
Merge branch 'master' of github.com:Gsarault44/carolinap
homepage