update little thing
merge
Merge branch 'master' of github.com:jackey/voteher