接口
Merge branch 'master' of https://github.com/rongyiwang/rongyi_term_lottery

Conflicts:
	app/controllers/fifa_matches_controller.rb