Reformatted json.
added styling
Fixed merge conflicts
Merge branch 'emmylucille-framework'
Merge remote-tracking branch 'upstream/master'