ultima
Merge branch 'segona' of https://github.com/rrodriguez1/examen1 into segona

Conflicts:
	un.txt