Slider SGA
Slider SGA merge
Slider SGA resuelto
Merge origin/master

Conflicts:
	src/Control/ControlSGA.java