added ajax to vote count to show vote number
fixed merge conflicts