FIXING SHIT
Merge branch 'master' of https://github.com/lchrislee/Pokeman-Parody-Adaptation.git
more edits to battle/player
Merge branch 'master' of
https://github.com/lchrislee/Pokeman-Parody-Adaptation.git