细节更改
Merge branch 'master' of github.com:limijiaoyin/kuzhanggui-votes
增加人名提醒
vote app
Merge branch 'master' of github.com:limijiaoyin/kuzhanggui-votes

Conflicts:
	votes/options/views.py