Updated for GvG

Update to add GvG cards; Compensated for format changes.