Fixed add_and_discard

Now passes test cases, completely rewritten, commented out old code.
Still need to redo card_played, card_led should be checked