Merge pull request #2 from Mischanix/reformatted

Backwards conversion of 1.2-format cardxml
Out with the old...
And in with the new.