Nueva sección
Merge branch 'master' of https://github.com/javism/practicas-is2
Foo
i
Merge branch 'nueva'

Conflicts:
	Foo.c