Score screen, leaderboard added
Merged conflicts
Merged more conflicts