BUG1
Fin BUG1
Merge branch 'BUG1'

Conflicts:
	Codigo.txt