Added hint functionality to Card.rb
Fixed merge issues