Trying to fix merges
Merge branch 'ScoreTracking' into LevelGeneration