fixed with real pokemon
Merge remote-tracking branch 'Joey/master'

Conflicts:
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/client/FokemonUI.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/client/TempBattle.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/shared/PokemonClasses/Pokemon.java