Mas cambios en el centro de control
Merge branch 'master' of https://github.com/KuzuriX/Progra2-P1

Conflicts:
	PrPlastikokEVillalobos/src/CentroControl.java