all broken still
signIn, signUp added to user controller
Merge pull request #8 from CanvasApp/teacher_routes

Teacher routes
angular stuff
merge conficts resolved
Merge pull request #7 from CanvasApp/angSkel

Ang skel
fixing merge errors