Merge Alterna2

Conflicts:
	Unapruebita/index.php