typos and fixes to make the labs a little less painful
type
fixed indentation
fixed index.jade indentation..added jade:debug to development task
Merge branch 'lab-5-uirouter' into lab-5-uirouter-solved

* lab-5-uirouter:
  fixed index.jade indentation..added jade:debug to development task
  type
  typos and fixes to make the labs a little less painful

Conflicts:
	client/assets/templates/app/projects/index.html
	client/assets/templates/app/timesheets/detail.html
	client/src/app/projects/controllers.js
	client/test/unit/app/timesheets/controllers.spec.js
index.jade indentation errors
Merge branch 'lab-5-uirouter-solved' into lab-6-interceptors

* lab-5-uirouter-solved:
  fixed index.jade indentation..added jade:debug to development task
  fixed indentation
  type
  typos and fixes to make the labs a little less painful
Merge branch 'lab-6-interceptors' into lab-6-interceptors-solved

* lab-6-interceptors:
  index.jade indentation errors
  fixed index.jade indentation..added jade:debug to development task
  fixed indentation
  type
  typos and fixes to make the labs a little less painful
Merge branch 'lab-6-interceptors-solved' into lab-7-factories

* lab-6-interceptors-solved:
  index.jade indentation errors
  fixed index.jade indentation..added jade:debug to development task
  fixed indentation
  type
  typos and fixes to make the labs a little less painful
Merge branch 'lab-7-factories' into lab-7-factories-solved

* lab-7-factories:
  index.jade indentation errors
  fixed index.jade indentation..added jade:debug to development task
  fixed indentation
  type
  typos and fixes to make the labs a little less painful
Merge branch 'lab-7-factories-solved' into lab-8-directives

* lab-7-factories-solved:
  index.jade indentation errors
  fixed index.jade indentation..added jade:debug to development task
  fixed indentation
  type
  typos and fixes to make the labs a little less painful
Merge branch 'lab-8-directives' into lab-8-directives-solved

* lab-8-directives:
  index.jade indentation errors
  fixed index.jade indentation..added jade:debug to development task
  fixed indentation
  type
  typos and fixes to make the labs a little less painful
Merge branch 'lab-8-directives-solved' into lab-9-filters

* lab-8-directives-solved:
  index.jade indentation errors
  fixed index.jade indentation..added jade:debug to development task
  fixed indentation
  type
  typos and fixes to make the labs a little less painful
Merge branch 'lab-9-filters' into lab-9-filters-solved

* lab-9-filters:
  index.jade indentation errors
  fixed index.jade indentation..added jade:debug to development task
  fixed indentation
  type
  typos and fixes to make the labs a little less painful
Merge branch 'lab-9-filters-solved' into lab-10-animations

* lab-9-filters-solved:
  index.jade indentation errors
  fixed index.jade indentation..added jade:debug to development task
  fixed indentation
  type
  typos and fixes to make the labs a little less painful
Merge branch 'lab-10-animations' into lab-10-animations-solved

* lab-10-animations:
  index.jade indentation errors
  fixed index.jade indentation..added jade:debug to development task
  fixed indentation
  type
  typos and fixes to make the labs a little less painful
Merge branch 'lab-10-animations-solved' into lab-11-protractor

* lab-10-animations-solved:
  index.jade indentation errors
  fixed index.jade indentation..added jade:debug to development task
  fixed indentation
  type
  typos and fixes to make the labs a little less painful
Merge branch 'lab-11-protractor' into lab-11-protractor-solved

* lab-11-protractor:
  index.jade indentation errors
  fixed index.jade indentation..added jade:debug to development task
  fixed indentation
  type
  typos and fixes to make the labs a little less painful
Merge branch 'lab-11-protractor-solved' into develop

* lab-11-protractor-solved:
  index.jade indentation errors
  fixed index.jade indentation..added jade:debug to development task
  fixed indentation
  type
  typos and fixes to make the labs a little less painful