Merge remote-tracking branch 'origin/master' into chris
collapsing fixed, end game trigger not in and saving not implemented.
Merge remote-tracking branch 'origin/master' into chris
Score now updates and end game triggers
Our team name is now displayed in the title bar. Worked on rendering the scores, but there is a big delay in the score activity being started