Added Controller Tests
Merge branch 'master' of https://github.com/panjiw/Team-Player
Merge branch 'master' of https://github.com/panjiw/Team-Player
Merge branch 'master' of https://github.com/panjiw/Team-Player
Added Tests