checked json object for type
Merge branch 'master' of https://github.com/adiagarwalla/cos333

merge