Added shuffling
Fixed deck bugs