Adding ability to select/deselect cards
Fixing merge conflicts
Fixing some compilation issues