commit before merge with derrike
Merge remote-tracking branch 'Derrike/working'
added somethings to battle
added PC to player class to store extra pokemon
Changed some sprites. Attempted to fix battle announcement. Failed
Merge remote-tracking branch 'Cody/master'
Merge remote-tracking branch 'Cody/master'
Merge remote-tracking branch 'Joey/master'
Merge remote-tracking branch 'maloney626/master' into working
Merge remote-tracking branch 'cfeltch537/master' into working

Conflicts:
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/client/BattleView.java