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