battle, making POKEMON, and fix errors
Merge branch 'master' of https://github.com/zgrove/pokemon_gridiron