merged with cody
fixed check fainted
Committing to catch up
fixed sleep and nondamaging moves doing 1 damage
update .gitignore
delete gwt-servlet.jar from git
working on xp
added xp addtion to battle class
Added level up mechanic and xp gaining
Added derricks items and moves
Branch for fixing images. Works!!!.
Added super effective moves
Good Commit. Joey is falling off arene
Fixed Battle Message
Added methods to handle end of battle; returning to MapView panel
Fixed effect timeing
Merge remote-tracking branch 'Cody/branch2'
Added Flinch
Merge remote-tracking branch 'Cody/branch2'
finished the move database