CanvasApp/CanvasApp — pull request #21 by joeelsey (2014-12-17 17:33:46+00:00)
Title: Course controller

Pull from course controller, got rid of merge conflicts.