Committing to catch up
DB commit
Merge remote-tracking branch 'Cody/master'

Conflicts:
	SoftwareEngineeringProject/.settings/com.google.gwt.eclipse.core.prefs
	SoftwareEngineeringProject/war/WEB-INF/lib/gwt-servlet.jar
RPC and FakeDatabase implemented
get rid of automatically-generated files
Basic Database Commit, Spot open for linking Pokemon ArrayList
Merge remote-tracking branch 'Cody/master'
Database able to store Player class using a blob.
Database Blob storage working, removing unnecessary files
commit before int
fgvdafljkgn;adfv
Merge remote-tracking branch 'Cody/master'

Conflicts:
	SoftwareEngineeringProject/.settings/com.google.gdt.eclipse.core.prefs
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/client/FokemonUI.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/client/MapView.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/client/RPC.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/shared/Battle/TurnChoice.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/shared/Player/Location.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/shared/PokemonClasses/Pokemon.java
Some changes to Fokemon UI
Merge remote-tracking branch 'Joey/master'
Merge remote-tracking branch 'Joey/master'

Conflicts:
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/shared/Player/Game.java
Able to save Players
Able to create new accounts
Able to load those new accounts and players
Committing more saving ability
Recommit Saving
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