started to add the items to the effect database
continued to store the items in an arraylist so that we could access
them much like we do the moves
added more items
commit
Merge remote-tracking branch 'Cody/master'
updated the item and effect database
Merge remote-tracking branch 'cfeltch537/master' into working

Conflicts:
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/shared/MoveClasses/EffectDataBase.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/shared/MoveClasses/EffectType.java
Merge remote-tracking branch 'maloney626/master' into working
updated the flinch aspect of the move database class
got dem items straight dawg
commit message it says to type
started changing battle over
started changing battle over
Merge branch 'master' of git@github.com:maloney626/SoftwareEngineeringProject.git
added message to beginning of battle
Merge remote-tracking branch 'Cody/master'
added in some of the pokemon sprites
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