Individual Assignment #4  Fixed

Conflicts:
	DaenirisTheForgotten/test/byui/CIT260/DaenirisTheForgotten/Control/SpellControlTest.java