Updated files per feedback

Better label names, pass # of match cards when game created not when
cards flipped, various other cleanup