unomasddd

as
oksubounonuevo
Merge branch 'master' of https://github.com/antroar/Tarea1

Conflicts:
	prueba.txt