Merge branch 'master' of github.com:Diasporism/wetube

merge
Merge branch 'master' of github.com:Diasporism/wetube

merge
Merge branch 'master' of github.com:Diasporism/wetube

syncing my files with master before pushing slight design changes to master
added background color for chats, changed chat name color
added the icons for play and pause as well as added client side validation for the chat input
Merge pull request #25 from Diasporism/play_pause

added the icons for play and pause as well as added client side validati...
Merge branch 'master' into sync_vid
Fixed merge conflict in schema