Initial commit
prueba
Merge branch 'master' of https://github.com/ximbayer/GranDT2013
Update hola.txt
aa
Merge branch 'master' of https://github.com/ximbayer/GranDT2013

Conflicts:
	hola.txt
vv
hola
Merge branch 'master' of https://github.com/ximbayer/GranDT2013
prueba
Merge branch 'master' of https://github.com/ximbayer/Technodt

Conflicts:
	README.md