Setting up index.html
Merge branch 'lab-2-angular' into lab-2-angular-solved

* lab-2-angular:
  Setting up index.html
Merge branch 'lab-2-angular-solved' into lab-3-karma

* lab-2-angular-solved:
  Setting up index.html
Merge branch 'lab-3-karma' into lab-3-karma-solved

* lab-3-karma:
  Setting up index.html
adding bower directories to gitignore
Merge branch 'lab-1-setup-solved' into lab-2-angular

* lab-1-setup-solved:
  adding bower directories to gitignore
Set up the index.html for labs
Merge branch 'lab-2-angular' into lab-2-angular-solved

* lab-2-angular:
  Set up the index.html for labs
  adding bower directories to gitignore
Merge branch 'lab-2-angular-solved' into lab-3-karma

* lab-2-angular-solved:
  Set up the index.html for labs
  adding bower directories to gitignore
removing jade:debug out of development task
Merge branch 'lab-3-karma' into lab-3-karma-solved

* lab-3-karma:
  removing jade:debug out of development task
  Set up the index.html for labs
  adding bower directories to gitignore
Merge branch 'lab-3-karma-solved' into lab-4-modules

* lab-3-karma-solved:
  removing jade:debug out of development task
  Set up the index.html for labs
  adding bower directories to gitignore
  Setting up index.html

Conflicts:
	client/assets/html/index.html
Removing project module from the lab so that the completed example can be used by the student for reference.
Added todo for nav bar items in index.html
remove $api out of tests
removing api out of tests - not needed
index.html script tag fixes and jade task
removing the projects view from labs.
Merge branch 'lab-4-modules' into lab-4-modules-solved

* lab-4-modules:
  index.html script tag fixes and jade task removing the projects view from labs.
  removing api out of tests - not needed
  remove $api out of tests
  Removing project module from the lab so that the completed example can be used by the student for reference. Added todo for nav bar items in index.html
  removing jade:debug out of development task
  Set up the index.html for labs
  adding bower directories to gitignore
  Setting up index.html
Merge branch 'lab-4-modules-solved' into lab-5-uirouter

* lab-4-modules-solved:
  index.html script tag fixes and jade task removing the projects view from labs.
  removing api out of tests - not needed
  remove $api out of tests
  Removing project module from the lab so that the completed example can be used by the student for reference. Added todo for nav bar items in index.html
  removing jade:debug out of development task
  Set up the index.html for labs
  adding bower directories to gitignore
  Setting up index.html

Conflicts:
	client/assets/html/index.html
	client/test/unit/app/employees/controllers.spec.js
	client/test/unit/app/projects/controllers.spec.js
	client/test/unit/app/timesheets/controllers.spec.js
Added index.html to lab
Removed Project module from labs so that students can use it as an example.
Set the time sheets and time units tests to be pre implemented for the lab. trying to make the lab more managable.