Fixed crappy red code and added json.
Merge branch 'master' of github.com:orby/hackaton