Merge pull request #65 from californiavol/macbook-branch

Macbook branch
Merge pull request #66 from californiavol/master

Merge master into imac-work
implementing a test controller
Merge pull request #67 from californiavol/macbook-branch

layout changes
Merge pull request #68 from californiavol/imac-work

Imac work
Merge pull request #69 from californiavol/master

merge from master