Merge pull request #1 from ngillespie/Wild_Pokemon_Battle_Bug

Wild pokemon battle bug