fabrica, maquina y molde
Merge remote-tracking branch 'origin/master'

Conflicts:
	PrPlastikokEVillalobos/src/CentroControl.java
	PrPlastikokEVillalobos/src/Molde.java