proper drawing and shuffling of cards
Merge commit 'c1cd1e5dc7252f407fb0eb250debe44fda672592' into mockup2