Merge remote-tracking branch 'origin/Counter' into input

Conflicts:
	ExBootstrap/InputScore.html
Merge branch 'input' of https://github.com/CBNutchP/CBBattlefieldScoreboard2 into input