Added in Joeys changes
Made a MoveTest class and also modified the MoveDataBase class with
joey.  The MoveDataBase class is still up for changing.
I made a effecttest class and very slightly update the effect class to
make it easier to test.  I also started separating the junit packages
into the same packages as in src that way I can tell what classes have
been tested and which have not
Changed the naming of TestLocation to LocationTest to match all other
tests
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