added font awesome css from netdna cdn & switched out sample player for strobe player
trying to convert date formats - still not working
date conversion still not working
added captioning plugin to directory

not added to code base yet
Merge pull request #45 from californiavol/imac-work

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

Macbook branch
Merge pull request #48 from californiavol/master

merge master into macbook-branch