start of player class
start of player class
test
Merge branch 'master' of git@github.com:maloney626/SoftwareEngineeringProject.git
Merge branch 'master' of
github.com:maloney626/SoftwareEngineeringProject

Conflicts:
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon/Player.java
Merge branch 'master' of git@github.com:maloney626/SoftwareEngineeringProject.git
Merge git://github.com/dhill3/SoftwareEngineeringProject
Created a testLocation class to effectively test all the methods in that
class as of now
test
Merge branch 'master' of
git@github.com:dhill3/SoftwareEngineeringProject.git
test
bad attempt
Merge branch 'master' of
git@github.com:maloney626/SoftwareEngineeringProject.git
Merge remote-tracking branch 'dhill3/master'
Recommitting classes
Pokemon
Added a battlestats class and a test class for it, added an enum status
class as well
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