SCSS已修改
Merge branch 'master' of https://github.com/rongyiwang/rongyi_term_lottery

Conflicts:
	app/assets/javascripts/turnplate_as.js