styles w some angular
merge
Merge pull request #44 from CanvasApp/styles

Styles
Merge branch 'dev' into teacher_controller