Updates to battle system and dialogue. Merges players/units so that they're both units.
Updates to battle system and dialogue. Merges players/units so that
they're both units.

butterscotchstallion/SpiffyRPG