Merge pull request #63 from californiavol/master

merge master into macbook-branch
fixed space in var key & removed link to course video homepage

homepage had no purpose
now playing date format
Merge pull request #65 from californiavol/macbook-branch

Macbook branch
Merge pull request #66 from californiavol/master

Merge master into imac-work
implementing a test controller
layout changes
Merge pull request #67 from californiavol/macbook-branch

layout changes
Merge pull request #68 from californiavol/imac-work

Imac work
Merge pull request #69 from californiavol/master

merge from master
Merge pull request #70 from californiavol/master

merge from master
Merge pull request #71 from californiavol/imac-work

Merge pull request #70 from californiavol/master
Merge pull request #72 from californiavol/macbook-branch

Merge pull request #69 from californiavol/master
Merge pull request #73 from californiavol/webs-web1dev

Merge pull request #64 from californiavol/master
Merge pull request #76 from californiavol/master

merge from master