Merge pull request #99 from californiavol/master

merge from master
Merge pull request #100 from californiavol/imac-work

Merge pull request #99 from californiavol/master
Merge pull request #101 from californiavol/macbook-branch

Merge pull request #98 from californiavol/master
Merge pull request #102 from californiavol/master

merge from master
Merge pull request #103 from californiavol/webs-web1dev

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

merge from master