prueba
Merge branch 'master' of https://github.com/alonjimo/TareaProgramada1

Conflicts:
	pato4.c
Merge branch 'master' of https://github.com/alonjimo/TareaProgramada1
actualizar