Updated card sorting to sort by both suit and value.