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

Conflicts:
	src/Pokemon.java
checked over merging and updated