Original push to own branch for controller unit tests for milestone 4A
preparing to merge into master
Merge pull request #22 from CombustibleLemons/devon-milestone-4

Devon milestone 4