sliderrrr
Merge branch 'master' of https://github.com/mparodi/Livent

Conflicts:
	app/assets/images/slides/slide1.png
	misc/prueba.png
	misc/slider/prueba.png