Fix compiler warnings for NSUInteger to int
Tests for CardMatchingGame
Dat bad merge
Update game scores to match expected values.