gitignore
Merge branch 'master' of https://github.com/clementaudam/Charoys-good-trips