Ejercicio 3 hecho
Merge branch 'master' of github.com:padsof-uam/arqo

Conflicts:
	.gitignore
	p4/Ejerc2.sh