Fix invalid json
Add gitignore
Merge branch 'master' into telefi