Removing the completed portions of index.html
updating protractor et al
Merge branch 'lab-1-setup-solved' into lab-2-angular

* lab-1-setup-solved:
  updating protractor et al
Merge branch 'lab-2-angular' into lab-2-angular-solved

* lab-2-angular:
  updating protractor et al
  Removing the completed portions of index.html
Merge branch 'lab-2-angular-solved' into lab-3-karma

* lab-2-angular-solved:
  updating protractor et al
  Removing the completed portions of index.html

Conflicts:
	client/assets/html/index.html
Merge branch 'lab-3-karma' into lab-3-karma-solved

* lab-3-karma:
  updating protractor et al
  Removing the completed portions of index.html