Temp commit
Merge branch 'master' of https://github.com/K0rka/Get_energy