Changed json
Fixed json
Merge branch 'master' of https://github.com/kwyngarden/CS147-Project
Merging.