Make Player and Pokemon class mo betta
Merge branch 'master' of https://github.com/macsj200/JavaPokemon.git