Merge remote-tracking branch 'upstream/master' into 328_focus_dizzy
Merge pull request #402 from blackshadowshade/328_focus_dizzy

Dizzy focus dice -- back-end
Merge remote-tracking branch 'upstream/master' into 358_tell_skills_to_UI