Merge pull request #129 from californiavol/master

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

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

Webs web1dev
Merge pull request #137 from californiavol/macbook-branch

Merge pull request #134 from californiavol/master
Merge pull request #138 from californiavol/macbook-branch

Macbook branch
Merge pull request #139 from californiavol/master

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

Merge pull request #139 from californiavol/master
Merge pull request #141 from californiavol/master

Merge from master
Merge pull request #142 from californiavol/webs-web1dev

Merge pull request #141 from californiavol/master
Merge pull request #143 from californiavol/master

Merge from master