some controller testing all tests pass
Merge pull request #16 from fiery-skippers-2014/testing

some controller testing all tests pass