fixing bugs but am I adding cruft?
Merge branch 'master' of https://github.com/ftrotter/fff
first merged file
fixed json bug