Merge pull request #1 from Crowducate/master

Uptodate
Adding Voting (stub)
up voting (not working, yet)
upvoting done
conflict issues
Merge pull request #16 from Rahbaran/master

Upvoting added