trying again
Merge branch 'master' of https://github.com/unionthugface/hackathons-energy