Json Primera fase
Merge branch 'master' of https://github.com/TN3STUDIO/tq into felipe