mudei a variavel
Merge remote-tracking branch 'origin/master'

Conflicts:
	pokemon/src/com/example/pokemon/HB.java