lab set up
new index.html
angular routing dependency
Merge branch 'lab-2-angular' into lab-2-angular-solved

* lab-2-angular:
  angular routing dependency
  lab set up

Conflicts:
	client/assets/html/index.html
solved with ngRoute del
Merge branch 'lab-2-angular-solved' into lab-3-karma

* lab-2-angular-solved:
  solved with ngRoute del
  angular routing dependency
  new index.html
  lab set up
Merge branch 'lab-3-karma' into lab-3-karma-solved

* lab-3-karma:
  solved with ngRoute del
  angular routing dependency
  new index.html
  lab set up

Conflicts:
	client/assets/html/index.html
fixing component path
Merge branch 'lab-3-karma-solved' into lab-4-modules

* lab-3-karma-solved:
  fixing component path
  solved with ngRoute del
  angular routing dependency
  new index.html
  lab set up
Merge branch 'lab-4-modules' into lab-4-modules-solved

* lab-4-modules:
  fixing component path
  solved with ngRoute del
  angular routing dependency
  new index.html
  lab set up
Merge branch 'lab-4-modules-solved' into lab-5-directives

* lab-4-modules-solved:
  fixing component path
  solved with ngRoute del
  angular routing dependency
  new index.html
  lab set up

Conflicts:
	client/assets/html/index.html