Merge branch 'macbook-branch' into imac-work
Merge branch 'imac-work' into macbook-branch
Merge pull request #1 from californiavol/imac-work

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

Macbook branch
Merge branch 'master' into macbook-branch
added example code for php filemtime
updated index action to account for both courses and videos
updated admin course list with table
added fields to course list table
Merge pull request #3 from californiavol/macbook-branch

Macbook branch
Merge branch 'master' into imac-work

Conflicts:
	application/views/scripts/index/index.phtml