pre-merge
merged
Added loading screen, changed background of scorescreen