Merge remote-tracking branch 'upstream/master'

Conflicts:
	gui/gui_configure_capture.m

Signed-off-by: Cesar <ccartagena89@gmail.com>
Merge remote-tracking branch 'upstream/master'

Conflicts:
	gui/gui_configure_capture.m
Se actualizo la captura a que funcionara mejor
Merge pull request #11 from ccartagena/master

Se mejoro la Captura