Gestor pintor
Merge branch 'master' of https://github.com/jercc20/ProyectoProgra2
Merge branch 'master' of https://github.com/jercc20/ProyectoProgra2