Updated some of the JSON parsing
Merge branch 'master' of https://github.com/cosmc/NJCTLCourseApp