Imagen que "gira"
Merge remote-tracking branch 'origin/master'

Conflicts:
	vistas/index.php