Merge pull request #1 from node200ok/master

merge from source
vote count
Merge branch 'master' of github.com:funkyLover/yjjapp
Merge pull request #3 from funkyLover/master

vote count