Switched data files to JSON
Merge pull request #54 from pjackson28/switchdatatojson

Switched data files to JSON