add json
working coachella
add dico
Merge branch 'master' of https://github.com/antoinechkaiban/coachella