js rewritten
Merge branch 'master' of github.com:xlcteam/scoreboard

Conflicts:
	scoreboard/static/js/stopwatch.js