Preview cards
Merge commit '6bc8c8e3e49aa22e741ac6783fe6b786ac807208' into new_cards
Normal cards
Merge commit 'c908f8bc481f879c8b007a5ca05c7acdb936482b' into new_cards
intermediately added timeout back in for actual gameplay
Merge branch 'new_cards'