Redoing stuff prt1
Fixing prt2
Fixed Errors and altering EnemyTest
Merge remote-tracking branch 'Ryan_Hammett/master'

Conflicts:
	RPGModelClassesTest/junit/com/jreale4/RPG/shared/EnemyTest.java
Merge remote-tracking branch 'jreale4/master'

Conflicts:
	RPGModelClassesTest/junit/com/jreale4/RPG/shared/EnemyTest.java