Cambiando logica calculo huella de carbono (not finished), fixes varios
Merge branch 'master' of https://github.com/hyoume/aesir