added parsed data in json file
changed tag to name
changed index.html
solved merge conflict
made some major changes
loading json bug fixed