changed gemfile.lock
merging
Merge branch 'master' of github.com:Diasporism/wetube

Deleting video.js
merged files
Merge branch 'master' of github.com:Diasporism/wetube

merge
Merge branch 'master' of github.com:Diasporism/wetube
started squashing bugs with chat
Merge branch 'master' of github.com:Diasporism/wetube into bug_squashin
Add invisible div over video player to keep users from pausing by clicking on the video itself. Removed javascript events to play and pause video based on video player status as it caused many bugs.
Cleanup of unnecessary code and tests.
Merge pull request #22 from Diasporism/bug_squashin

Bug squashin