merge
Merge branch 'master' of github.com:xlcteam/rc-scoreboard

Conflicts:
	scoreboard/scoreboard.db