added somethings to battle
added PC to player class to store extra pokemon
Merge remote-tracking branch 'Cody/master'