Add Scoreboard

Add seemingly working scoreboard
Merge remote-tracking branch 'origin/master'

Conflicts:
	404.js
Resolve merge conflict