new line added
Merge branch 'master' of https://github.com/yuxiandresd/yuxi_training

Conflicts:
	juan-cuartas-5.txt