cambios en submodulo
fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	submod_dataA.txt
	submod_dataB.txt