commit changes battleView
started changing battle over
started changing battle over
Merge branch 'master' of git@github.com:maloney626/SoftwareEngineeringProject.git
Random battles now happen 12% of the time
added message to beginning of battle
Merge remote-tracking branch 'Cody/master'
need to merge with derrick
can't merge with derrike
Merge remote-tracking branch 'dhill3/working'

Conflicts:
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/client/BattleView.java
I FUCKING HATE EGIT. Just lost 5 hours of word and 10 commits.
added XP bar for player
Separated Draw methods in Mapview; Handled walking through tall grass
updated pokemon sprites