segundo commit de carlos
Merge branch 'master' of https://github.com/ovasgus/Simulador