updates
Merge branch 'master' of
https://github.com/samisftw/PokemonShowdownJava.git