test
Merge branch 'cleaning-fred' of github.com:laurabunea/Fred into cleaning-fred
fixed json