Merge pull request #66 from californiavol/master

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

Imac work