Fixed merge edits
Rebasing
Changed video queue in room.js
Cleaned up comments
Cleaned up code
Removed main.js
Removed DS_Store
Merge pull request #76 from ogwiz2/develop

(feat)  Synced Youtube player to videoqueue