json madness
Merge pull request #4 from jennielouie/master

json madness