(FEAT) Fixing merge conflicts
(REFACTOR) Deleted a file that did not exist but was being referenced on load from index - scripts/services/videoqueue.js
(FEAT) If the queue is playing, loading next video.  Still need to play next video after video ends.
(FEAT) Voting working as expected, videos loading correctly.  Need to connect voting with the profiles & actual voting logic.
(REFACTOR) Got rid of some bad merge conflicts
(BUG) Working on merge conflicts
(REFACTOR) Merge complete, vote feature working
Merge pull request #37 from Oleg24/feat/voting

(FEAT) Voting feature implemented with DB