Equation cards now being displayed during battle.
Merge remote-tracking branch 'origin/master'