index.html with angular router script dependency
fixing component path
removing docco
Merge branch 'lab-1-setup-solved' into lab-2-angular

* lab-1-setup-solved:
  removing docco
Merge branch 'lab-2-angular' into lab-2-angular-solved

* lab-2-angular:
  removing docco
  index.html with angular router script dependency
Merge branch 'lab-2-angular-solved' into lab-3-karma

* lab-2-angular-solved:
  removing docco
  index.html with angular router script dependency
Merge branch 'lab-3-karma' into lab-3-karma-solved

* lab-3-karma:
  removing docco
  fixing component path
  index.html with angular router script dependency

Conflicts:
	karma.config.js
Merge branch 'lab-3-karma-solved' into lab-4-modules

* lab-3-karma-solved:
  removing docco
  fixing component path
  index.html with angular router script dependency