Scroll through player cards

Player can now view all cards in hand
Bug fixes
conflict resolve
conflict resolve 2