Update to
Update Merge branch 'master' of https://github.com/thysmichels/school-energy-io