refactored characterclass to merge it into combatant, except for the generate function which was moved to the avatar class.
moved around some of the logic for generating characters. i'm still a bit undecided on what goes where, so there is likely to be much shifting
moved combatant information into a json file.