Controles carrusel..
Merge remote-tracking branch 'origin'

Conflicts:
	app/assets/stylesheets/equipo.css.scss
Contactos