Ajustes diego 30/07
Merge branch 'master' of https://github.com/lemosadiego/syscontrol.git