recuperando...
Merge branch 'master' of https://github.com/bernat13/troud.im

Conflicts:
	hola.txt