relleno

texto ingresado
fix new_file.txt

Conflicts:
	new_file.txt
Merge branch 'master' of https://github.com/yuxiandresd/yuxi_training