finished testing JSON parse, updated actual files
Merge branch 'master' of https://github.com/EdwardGong/rater