finished signin, started messages
started messages controller
should be synced
template
"
git commit -m template
merge conflicts
Merge pull request #30 from CanvasApp/controllers

Controllers
Merge branch 'dev' into angular_tests
broken tests for broken code