Agregando metodos a maquina y la clase Detector
Merge remote-tracking branch 'origin/master'

Conflicts:
	PrPlastikokEVillalobos/src/Detector.java
	PrPlastikokEVillalobos/src/Maquina.java