Merge pull request #106 from californiavol/master

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

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

Merge pull request #106 from californiavol/master
Merge pull request #113 from californiavol/macbook-branch

Macbook branch
Merge pull request #114 from californiavol/imac-work

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

Merge from master