Fixed JSON parsing
Merge branch 'master' of github.com:knowbody/Team6