Update Sitless with video player and video draft

[g-liu]

It's all in the description!

[jayfo]

Look in the network graph, you have your own master. That ain't good.

https://github.com/uwcse440/web-cse440-au15/network

Get your master back to our current:

git checkout master
git reset --hard uwcse440/master
git push - f

Then rebase this onto that:

git checkout sitless
git rebase master
git push -f

That'll update this pull request.

That work?