Carousel (un poco cojo)
Merge branch 'develop' of https://github.com/eadpucv/pyxis into develop

Conflicts:
	css/pyxis.css