Merge pull request #29 from californiavol/macbook-branch

Macbook branch
Merge pull request #30 from californiavol/macbook-branch

Macbook branch
Merge pull request #31 from californiavol/webs-web1dev

Merge pull request #30 from californiavol/macbook-branch
Merge pull request #32 from californiavol/master

merge from master