modified:   app/views/page/scoreboard.html.erb
Merge branch 'master' of https://github.com/yuantuo/tournament

Conflicts:
	app/views/page/scoreboard.html.erb

	modified:   app/assets/stylesheets/page.css.scss
	modified:   app/views/page/scoreboard.html.erb