fix rank
Merge branch 'master' of github.com:limijiaoyin/china-v
save
Merge branch 'master' of github.com:limijiaoyin/china-v
Merge pull request #21 from hexiaoming/master

替换后台+前端修改接口
change
Merge branch 'master' of github.com:limijiaoyin/china-v

Conflicts:
	templates/shake/rank.html
Merge pull request #22 from hexiaoming/master

pk
提交修改内容
Merge branch 'master' of github.com:limijiaoyin/china-v

Conflicts:
	assets/img/shake/rules.png
Merge pull request #23 from hexiaoming/master

更改部分细节
Merge branch 'master' of github.com:limijiaoyin/china-v
Merge pull request #24 from hexiaoming/master

增加适配 优化
Merge branch 'master' of github.com:limijiaoyin/china-v
Merge pull request #25 from hexiaoming/master

增加单人模式
vote_id
Merge branch 'master' of github.com:limijiaoyin/china-v
Merge pull request #26 from hexiaoming/master

修改bug
Merge branch 'master' of github.com:limijiaoyin/china-v
Merge pull request #27 from hexiaoming/master

修改bug