BustinBash/BustinBash — pull request #18 by arikgadye (2014-08-18 01:01:28+00:00)
Title: Data json

refactor code to take in reformatted json
Resolve merge conflict after changing the data.json format