Initial Unification Attempt

This is my first attempt to unify the PokemonTabletopUnitedFull branch
w/ the PokemonTabletopUnited branch.