Merge branch 'master' of
git@github.com:dhill3/SoftwareEngineeringProject.git
test
bad attempt
Merge remote-tracking branch 'dhill3/master'
Pokemon
Merge remote-tracking branch 'dhill3/master'

Conflicts:
	SoftwareEngineeringProject/junit/edu/ycp/cs320/SoftwareEngineeringProject/PokemonTest.java
	SoftwareEngineeringProject/junit/edu/ycp/cs320/SoftwareEngineeringProject/TestLocation.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon/Pokemon.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon/main.java
Beginning EffectClass
EFFECT UPDATE AS ENUM
Merge remote-tracking branch 'maloney626/master'
merged changes from joey