Merge remote-tracking branch 'dhill3/master'

Conflicts:
	SoftwareEngineeringProject/junit/edu/ycp/cs320/SoftwareEngineeringProject/BattleStatsTest.java
	SoftwareEngineeringProject/junit/edu/ycp/cs320/SoftwareEngineeringProject/EffectDataBaseTest.java
	SoftwareEngineeringProject/junit/edu/ycp/cs320/SoftwareEngineeringProject/PokeInfoTest.java
	SoftwareEngineeringProject/junit/edu/ycp/cs320/SoftwareEngineeringProject/PokemonTest.java
	SoftwareEngineeringProject/src/MoveClasses/EffectDataBase.java
	SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon/PokeType.java
test
Merge remote-tracking branch 'origin/master'