WIld pokemon bug fix
Merge branch 'master' of ssh://github.com/ahansen3/Cse20212