slight updates
Merge branch 'master' of https://github.com/samisftw/PokemonShowdownJava.git
damage calc
type weakness/resistance shell