抽奖逻辑重构
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/pushes/create.html.erb
	log/development.log