añado hola
Merge branch 'master' of https://github.com/mdrorum/mcgs
arreglos con hola.txt
Conflicts:
	practicas/practica02/hola.txt
dos ficheros mas