Recommitting classes
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