修改内容
Merge branch 'master' of github.com:limijiaoyin/kuzhanggui-votes

Conflicts:
	votes/options/views.py
Merge branch 'master' of github.com:limijiaoyin/kuzhanggui-votes
disable jackclicking
save
save
wtf
save
Merge branch 'master' of github.com:limijiaoyin/kuzhanggui-votes