Agus version 1

Agus version 1
Merge remote-tracking branch 'origin/Agustin' into santiago

Conflicts:
	Probando.txt