json stuff
Merge branch 'master' of https://github.com/tafleming/cs480
Merge pull request #1 from tafleming/master

initial json stuff