temp fix for failing tests at beginning
Pulled the controller stuff out of the directive labs. Not needed and they made all of the controller tests fail at the beginning of the lab, which is not good.
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
Merge branch 'lab-3-karma-solved' into lab-4-modules

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

* lab-4-modules:
  updating protractor et al
  Removing the completed portions of index.html
Merge branch 'lab-4-modules-solved' into lab-5-uirouter

* lab-4-modules-solved:
  updating protractor et al
  Removing the completed portions of index.html
Merge branch 'lab-5-uirouter' into lab-5-uirouter-solved

* lab-5-uirouter:
  updating protractor et al
  Removing the completed portions of index.html
Merge branch 'lab-5-uirouter-solved' into lab-6-interceptors

* lab-5-uirouter-solved:
  updating protractor et al
  Removing the completed portions of index.html
Merge branch 'lab-6-interceptors' into lab-6-interceptors-solved

* lab-6-interceptors:
  updating protractor et al
  Removing the completed portions of index.html
Merge branch 'lab-6-interceptors-solved' into lab-7-factories

* lab-6-interceptors-solved:
  updating protractor et al
  Removing the completed portions of index.html
Merge branch 'lab-7-factories' into lab-7-factories-solved

* lab-7-factories:
  updating protractor et al
  Removing the completed portions of index.html
Merge branch 'lab-7-factories-solved' into lab-8-directives

* lab-7-factories-solved:
  updating protractor et al
  Removing the completed portions of index.html
Merge branch 'lab-8-directives' into lab-8-directives-solved

* lab-8-directives:
  updating protractor et al
  Removing the completed portions of index.html
  Pulled the controller stuff out of the directive labs. Not needed and they made all of the controller tests fail at the beginning of the lab, which is not good.
  temp fix for failing tests at beginning

Conflicts:
	client/src/app/timesheets/controllers.js
Merge branch 'lab-8-directives-solved' into lab-9-filters

* lab-8-directives-solved:
  updating protractor et al
  Removing the completed portions of index.html
  Pulled the controller stuff out of the directive labs. Not needed and they made all of the controller tests fail at the beginning of the lab, which is not good.
  temp fix for failing tests at beginning