Cardstack constructor initialization and player.cpp changes.
Merged conflicts