Merge pull request #132 from californiavol/macbook-branch

Macbook branch
added embed video function
deleted two unnecessary js files for jwplayer
embed still not working completely
Merge pull request #133 from californiavol/imac-work

Imac work
Merge pull request #134 from californiavol/master

merge from master