fix merge accents
Merge branch 'master' of https://github.com/Dexedrine/CulturalStore.git