Done a lot of work on scoring, ending games, matches, etc.  Not quite done yet
Almost finished with tournament manager
Fixed merge conflicts