Merge pull request #60 from californiavol/macbook-branch

Macbook branch
Merge pull request #61 from californiavol/master

Merge master into imac-work
added disable link to unrecorded videos
added more styling
Merge pull request #62 from californiavol/imac-work

Imac work
Merge pull request #63 from californiavol/master

merge master into macbook-branch