Merge pull request #104 from californiavol/master

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

merge from master
added data table to course list
Merge pull request #107 from californiavol/imac-work

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

Merge pull request #105 from californiavol/master
Merge pull request #111 from californiavol/webs-web1dev

Merge pull request #106 from californiavol/master
Merge pull request #112 from californiavol/master

merge from master