Merge pull request #23 from dunphyben/votes

Votes
Vote for videos you like
Merge branch 'master' into votes

Merge master into votes