Scoreboard fixes
Merge remote-tracking branch 'origin/master'

Conflicts:

	TwoThousandAndFortyEight/TwoThousandAndFortyEight/Scripts/testingsomestuff.js
Merge branch 'master' of https://github.com/OciCekov/Team-Belokk