Merge pull request #51 from californiavol/master

merge imac work and master
added pagination to video list and reworked css layout
Merge pull request #53 from californiavol/imac-work

Imac work
Merge pull request #54 from californiavol/macbook-branch

Merge pull request #52 from californiavol/master
Merge pull request #56 from californiavol/master

merge master into macbook-branch