change
Merge branch 'master' of github.com:limijiaoyin/china-v

Conflicts:
	templates/shake/rank.html
提交修改内容
Merge branch 'master' of github.com:limijiaoyin/china-v

Conflicts:
	assets/img/shake/rules.png
Merge branch 'master' of github.com:limijiaoyin/china-v
Merge branch 'master' of github.com:limijiaoyin/china-v
vote_id
Merge branch 'master' of github.com:limijiaoyin/china-v
Merge branch 'master' of github.com:limijiaoyin/china-v
Merge branch 'master' of github.com:limijiaoyin/china-v
save