Working on moving spell controls from the SpellMenuView to SpellControl
Merge origin/master
Working on moving spell controls from the SpellMenuView to SpellControl
Merge origin/master

Conflicts:
	DaenirisTheForgotten/src/byui/CIT260/DaenirisTheForgotten/Control/GameControl.java
Merge origin/master

Conflicts:
	DaenirisTheForgotten/src/byui/CIT260/DaenirisTheForgotten/Control/GameControl.java
Merge origin/master
Merge origin/master

Conflicts:
	DaenirisTheForgotten/src/byui/CIT260/DaenirisTheForgotten/Control/GameControl.java
Merge origin/master

Conflicts:
	DaenirisTheForgotten/src/byui/CIT260/DaenirisTheForgotten/Control/GameControl.java