added alternate layout for admin module
Merge pull request #25 from californiavol/imac-work

Merge pull request #24 from californiavol/master
Merge pull request #26 from californiavol/macbook-branch

added alternate layout for admin module
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
Merge branch 'master' into macbook-branch
added available_time field to courses db and added time conversion to insert statement
Merge branch 'webs-web1dev' into macbook-branch
Merge pull request #29 from californiavol/macbook-branch

Macbook branch
Merge pull request #30 from californiavol/macbook-branch

Macbook branch
Merge pull request #31 from californiavol/webs-web1dev

Merge pull request #30 from californiavol/macbook-branch
Merge pull request #32 from californiavol/master

merge from master
Merge pull request #33 from californiavol/macbook-branch

Merge pull request #32 from californiavol/master
added bg image for admin jumbotron
updated admin index.phtml
Merge pull request #34 from californiavol/macbook-branch

Macbook branch
Merge pull request #35 from californiavol/master

Merge master into imac-work