Add spells to combat UI, closes #132
Merge branch 'bugfix/fightSpells' into develop