Trying to make transitions from waiting to battle
lol..messsed up
Merge branch 'master' of
git@github.com:lchrislee/Pokeman-Parody-Adaptation.git