fixed cards.h, started to fix container.h, started game.cpp
fixed conflict issues in card.h, container.h