Updating exercises

Integrating Matias's feedback
Merge branch 'M2' of github.com:angularjs-foundation/video-app into M2