Merge pull request #112 from californiavol/master

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

Merge from master
Merge pull request #117 from californiavol/master

Merge from master
Merge pull request #118 from californiavol/imac-work

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

Merge pull request #117 from californiavol/master
Merge pull request #120 from californiavol/webs-web1dev

Webs web1dev
Merge pull request #121 from californiavol/master

Merge from master