Merge branch 'lab-2-angular' into lab-2-angular-solved
Merge branch 'lab-2-angular-solved' of https://github.com/objectpartners/angular-timesheet into lab-2-angular-solved

# Via Michael Kelly
* 'lab-2-angular-solved' of https://github.com/objectpartners/angular-timesheet:
UP doesn't have the new protractor in the NPM
Merge branch 'lab-1-setup-solved' into lab-2-angular

* lab-1-setup-solved:
  UP doesn't have the new protractor in the NPM
Merge branch 'lab-2-angular' into lab-2-angular-solved

* lab-2-angular:
  UP doesn't have the new protractor in the NPM
Merge branch 'lab-2-angular-solved' into lab-3-karma

* lab-2-angular-solved:
  UP doesn't have the new protractor in the NPM

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

* lab-3-karma:
  UP doesn't have the new protractor in the NPM
Merge branch 'lab-3-karma-solved' into lab-4-modules

* lab-3-karma-solved:
  UP doesn't have the new protractor in the NPM