Merge Alterna

Conflicts:
	Unapruebita/index.php
Merge Alterna2

Conflicts:
	Unapruebita/index.php