Initial Unification Attemp

My first attempt to merge PokemonTabletopUnitedFull with PokemonTabletopUnited. Probably needs work