dfdsf
cs
Merge branch 'bet_result' into release

Conflicts:
	app/assets/stylesheets/users.css.scss
	app/helpers/application_helper.rb
	app/views/home/bet.html.erb
cs