log files and json conversion
Merge branch 'master' of https://github.com/jfoshee/rockhack
changed json file