--Battle and player...need to change more
Merge branch 'master' of
git@github.com:lchrislee/Pokeman-Parody-Adaptation.git