fixing js errors
Merge branch 'master' of https://github.com/EJEHardenberg/GreenUp
Merge branch 'master' of https://github.com/EJEHardenberg/GreenUp