Merge branch 'imac-work' into macbook-branch
Merge branch 'imac-work' into macbook-branch
Merge branch 'imac-work' into macbook-branch
Merge branch 'macbook-branch' of https://github.com/californiavol/amsvideo-dev into macbook-branch

Conflicts:
	application/controllers/IndexController.php
	application/views/scripts/index/_courseVideoLoop.phtml
Merge branch 'imac-work' into macbook-branch

Conflicts:
	application/controllers/IndexController.php
	application/views/scripts/index/_courseVideoLoop.phtml
Merge pull request #7 from californiavol/macbook-branch

Macbook branch