Fix typo in filename of controller
Merge branch 'master' of https://github.com/NewRosies/conductor