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

Merge master into votes
Merge pull request #24 from dunphyben/votes

Votes