setting up index.html
Merge branch 'lab-4-modules' into lab-4-modules-solved

* lab-4-modules:
  setting up index.html
removed $ from api and control services
renamed control service to 'data'
saved the renaming of control to data
Merge pull request #24 from objectpartners/remove-dollar-sign

Remove dollar sign
Merge branch 'lab-4-modules' into lab-4-modules-solved

* lab-4-modules:
  saved the renaming of control to data
  removed $ from api and control services renamed control service to 'data'

Conflicts:
	client/src/app/employees/employees.js
	client/src/app/projects/projects.js
	client/src/app/timesheets/timesheets.js
renaming $control to data
Merge branch 'lab-4-modules-solved' into lab-5-uirouter

* lab-4-modules-solved:
  renaming $control to data
  saved the renaming of control to data
  removed $ from api and control services renamed control service to 'data'
  setting up index.html

Conflicts:
	client/assets/html/index.html
	client/src/app/employees/controllers.js
	client/src/app/employees/employees.js
	client/src/app/projects/controllers.js
	client/src/app/projects/projects.js
	client/src/app/timesheets/controllers.js
Merge branch 'lab-5-uirouter' into lab-5-uirouter-solved

* lab-5-uirouter:
  renaming $control to data
  saved the renaming of control to data
  removed $ from api and control services renamed control service to 'data'
  setting up index.html

Conflicts:
	client/src/app/employees/controllers.js
	client/src/app/projects/controllers.js
	client/src/app/projects/projects.js
	client/src/app/timesheets/controllers.js
	client/src/app/timesheets/timeunits/controllers.js
renaming $control to data
Merge branch 'lab-5-uirouter-solved' into lab-6-interceptors

* lab-5-uirouter-solved:
  renaming $control to data
  renaming $control to data
  saved the renaming of control to data
  removed $ from api and control services renamed control service to 'data'
  setting up index.html
Merge branch 'lab-6-interceptors' into lab-6-interceptors-solved

* lab-6-interceptors:
  renaming $control to data
  renaming $control to data
  saved the renaming of control to data
  removed $ from api and control services renamed control service to 'data'
  setting up index.html

Conflicts:
	client/src/app/employees/controllers.js
Merge branch 'lab-6-interceptors-solved' into lab-7-factories

* lab-6-interceptors-solved:
  renaming $control to data
  renaming $control to data
  saved the renaming of control to data
  removed $ from api and control services renamed control service to 'data'
  setting up index.html

Conflicts:
	client/src/app/employees/controllers.js
	client/src/app/projects/controllers.js
	client/src/app/timesheets/controllers.js
	client/src/app/timesheets/timeunits/controllers.js
Merge branch 'lab-7-factories' into lab-7-factories-solved

* lab-7-factories:
  renaming $control to data
  renaming $control to data
  saved the renaming of control to data
  removed $ from api and control services renamed control service to 'data'
  setting up index.html

Conflicts:
	client/src/app/employees/controllers.js
	client/src/app/projects/controllers.js
	client/src/app/timesheets/controllers.js
	client/src/app/timesheets/timeunits/controllers.js
Merge branch 'lab-7-factories-solved' into lab-8-directives

* lab-7-factories-solved:
  renaming $control to data
  renaming $control to data
  saved the renaming of control to data
  removed $ from api and control services renamed control service to 'data'
  setting up index.html

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

* lab-8-directives:
  renaming $control to data
  renaming $control to data
  saved the renaming of control to data
  removed $ from api and control services renamed control service to 'data'
  setting up index.html

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

* lab-8-directives-solved:
  renaming $control to data
  renaming $control to data
  saved the renaming of control to data
  removed $ from api and control services renamed control service to 'data'
  setting up index.html
remove the $
remove the $
Merge branch 'lab-7-factories' into lab-7-factories-solved

* lab-7-factories:
  remove the $
  remove the $

Conflicts:
	client/src/app/timesheets/controllers.js
	client/src/security/services/authentication.js