Updating exercises
Merge branch 'M4' of github.com:angularjs-foundation/video-app into M4

Conflicts:
	README.md