hola
Merge branch 'master' of https://github.com/ccastroh/CI-1331-Lab-1

Conflicts:
	hola.txt