Worked on the code

Worked on the code
Merge remote-tracking branch 'origin/master'

Conflicts:
	netbeans project/PokemonGame/src/pokemongame/PokemonGame.java