Prueba Colision tercera linea
Merge branch 'master' of https://github.com/Niko24x/HD1

Conflicts:
	hola.txt