adjustments to json format
Merge branch 'master' of https://github.com/EJEHardenberg/GreenUp
Got the database to update correctly
Merge branch 'master' of https://github.com/EJEHardenberg/GreenUp