teacher template and controller updted
merge conflicts
Merge branch 'dev' into teacher_controller
client updated
rmv ng app gen
add and rmv teachers
Merge pull request #46 from CanvasApp/teacher_controller

Teacher controller