Agrego holamundo
Update lista.txt
Elimine lista chafa
Merge branch 'master' of https://github.com/nmicht/practica-git-cucei-2014a
Merge branch 'master' of https://github.com/nmicht/practica-git-cucei-2014a

Conflicts:
	d04/lista