Borro arhivo temporal lista.txt~
Merge branch 'master' of git://github.com/nmicht/practica-git-cucei-2013B

Conflicts:
	D03/lista.txt~
Merge branch 'master' of git://github.com/nmicht/practica-git-cucei-2013B