Passes all controller tests
Merge pull request #23 from fiery-skippers-2014/controller_test

Passes all controller tests