Merge pull request #91 from californiavol/macbook-branch

Macbook branch
Merge pull request #92 from californiavol/master

Merge master into imac-work
Merge pull request #93 from californiavol/master

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

Merge pull request #92 from californiavol/master
Merge pull request #95 from californiavol/webs-web1dev

Merge pull request #93 from californiavol/master
added user controller
Merge pull request #96 from californiavol/imac-work

added user controller
Merge pull request #97 from californiavol/macbook-branch

minor css changes
Merge pull request #98 from californiavol/master

merge from master