Refactorizado el consumo electrico
Merge branch 'master' into pablo