Removing watch on deps.js
Merge branch 'lab-3-karma' into lab-3-karma-solved

Conflicts:
	karma.config.js
Merge branch 'lab-3-karma-solved' into lab-4-modules
Merge branch 'lab-4-modules' into lab-4-modules-solved
Merge branch 'lab-4-modules-solved' into lab-5-uirouter
Merge branch 'lab-5-uirouter' into lab-5-uirouter-solved
Merge branch 'lab-5-uirouter-solved' into lab-6-interceptors
Merge branch 'lab-6-interceptors' into lab-6-interceptors-solved
Merge branch 'lab-6-interceptors-solved' into lab-7-factories
Merge branch 'lab-7-factories' into lab-7-factories-solved
Merge branch 'lab-7-factories-solved' into lab-8-directives
Merge branch 'lab-8-directives' into lab-8-directives-solved
Merge branch 'lab-8-directives-solved' into lab-9-filters
Merge branch 'lab-9-filters' into lab-9-filters-solved
Merge branch 'lab-9-filters-solved' into lab-10-animations
Merge branch 'lab-10-animations' into lab-10-animations-solved
Merge branch 'lab-10-animations-solved' into lab-11-protractor
Merge branch 'lab-11-protractor' into lab-11-protractor-solved
Merge branch 'lab-11-protractor-solved' into develop