refactor code to take in reformatted json
Resolve merge conflict after changing the data.json format
Merge pull request #18 from BustinBash/DATA/Json

Data json