fixed all json problems
Merge branch 'master' of https://github.com/joehzli/fbhackathon