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

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