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

Passes all controller tests
Merge branch 'master' of https://github.com/fiery-skippers-2014/Team-NATL into model_dependencies

adding tests