working off of game
working off of game
Merge branch 'master' of git@github.com:maloney626/SoftwareEngineeringProject.git
Merge branch 'master' of
git@github.com:maloney626/SoftwareEngineeringProject.git

Conflicts:
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/client/BattleView.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/client/FokemonUI.java
Added pokemon change on death
Game has heal team method
got csv ready for evolution
Added movelist to csv
Think I got evolution and learning moves working addtionally fixed xp
from caought pokemon bug fixed
Working with bugs
Merge with some of codys healing code
Getting cody's code merged still
finished merging cody's changes
Merge remote-tracking branch 'Joey/master'

Conflicts:
	SoftwareEngineeringProject/.gwt/.gwt-log
	SoftwareEngineeringProject/derby.log
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/client/FokemonUI.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/client/LoginView.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/client/MapView.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/shared/GUI/InteractableObject.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/shared/GUI/Interaction.java
	SoftwareEngineeringProject/war/derby.log