Start of BattleClass
restructured classes
start of battle class
Updated battle class and start of junit test as proof of concept
update to merge
added xp stuff
Merge remote-tracking branch 'Cody/master' into GWTfixed
adding switch player
random changes
Merge branch 'GWTFixed'
Merge branch 'master' of github.com:maloney626/SoftwareEngineeringProject

Conflicts:
	SoftwareEngineeringProject/junit/edu/ycp/cs320/SoftwareEngineeringProject/TestLocation.java
	SoftwareEngineeringProject/junit/edu/ycp/cs320/battleTests/BattleTest.java
	SoftwareEngineeringProject/junit/edu/ycp/cs320/fokemonTests/BattleStatsTest.java
	SoftwareEngineeringProject/src/PlayerClasses/Location.java
	SoftwareEngineeringProject/src/PlayerClasses/Player.java
	SoftwareEngineeringProject/src/PokemonClasses/BattleStats.java
	SoftwareEngineeringProject/src/PokemonClasses/Pokemon.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon/BattleStats.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon/Location.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/shared/MoveClasses/Move.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/shared/MoveClasses/MoveDataBase.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/shared/Player/Location.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/shared/PokemonClasses/BattleStats.java
edited pokedex
reset
test
commit
Merge branch 'master' of
git@github.com:maloney626/SoftwareEngineeringProject.git

Conflicts:
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/shared/Battle/Battle.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/shared/GUI/TempMapPanel.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/shared/GUI/Terrain.java
errors with RPC
gtege
Actually Creating Pokemon
Merge remote-tracking branch 'Joey/master'

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