Merge pull request #27 from californiavol/master

merge from master
updated admin layout and added a few get functions to videos model
Merge pull request #28 from californiavol/macbook-branch

Macbook branch