Numeros del 1 al 5
Merge branch 'develop' into feature/cruzjn

Conflicts:
	lista.txt
Merge pull request #2 from anbade/feature/cruzjn

Feature/cruzjn