fixing nil results
returning minutes
Merge pull request #91 from bobolinks-2014/controller-refactor

Controller refactor