fixed bug with 1s being discarded

Fixed bug with 1s discarded, made it so game doesn't auto-restart when over and added announcement for last round.
return match == 2;