varios cambios hechos el viernes
Merge branch 'master' of https://github.com/sergiodxa/ProSlider

Conflicts:
	test.html