Commit after partial progress towards setting up card layouts.
Finish randomization for cards. Still need to setup free and mc questions.
Merge with master and repair conflicts