Play y Pausa
Imagenes
Merge remote-tracking branch 'origin/master'

Conflicts:
	WD Player/build/classes/wd/player/frmPrincipal.form
	WD Player/src/wd/player/frmPrincipal.java