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