resolution conflit
mise à jour settings et gitignore
Merge branch 'master' of github.com:LaetitiaNanni/komuso