encabezados
Merge remote-tracking branch 'origin/master'

Conflicts:
	FileGenerator/datos.txt
Merge branch 'master' of https://github.com/chamocc/HDT3

Conflicts:
	FileGenerator/datos.txt