Need help with combining these two classes.

[Gilthunder]

So a group of friends already had a game going and I'm new to it all. They already stated that they are playing a broken version so the DM said it was alright for the two classes, which are the the Storm magus and the ki master (non prestige nor variant) I need advice of roughly how the character sheet should look and how I would combined them.

[Psyren]

Do you mean these two?

http://www.dandwiki.com/wiki/Storm_Magus_(3.5e_Class)
http://www.dandwiki.com/wiki/Ki_Master_(3.5e_Class)

[Grod_The_Giant]

And what do you mean by "combining them"-- multiclassing, or gestalt?

If you're unfamiliar with the latter, Gestalt is a variant where you take two classes at once, basically. You get everything in the "Special" column for both classes, and all their class skills, but otherwise you pick the better HD, BAB, Fort, Ref, and Will saves, and skill points/level.