Added a jade task to compile index.html and add it to the client/assets directory.
Configured server.js to serve the compiled html instead of index.jade for root.
Removed the application controller. Locomotive is only used for the api endpoints.
Gruntfile cleanup to remove duplication.
Merge pull request #21 from objectpartners/nodemon-jade-fixes

Added a jade task to compile index.html and add it to the client/assets ...
This closes #3 by adding the configuration to avoid permission failures.
Merge branch 'lab-1-setup' into nodemon-jade-fixes

* lab-1-setup:
  This closes #3 by adding the configuration to avoid permission failures.
Merge pull request #22 from objectpartners/nodemon-jade-fixes

fixed .bowerrc for permissions
Merge branch 'lab-1-setup-solved' into lab-2-angular

* lab-1-setup-solved:
  This closes #3 by adding the configuration to avoid permission failures.
  Added a jade task to compile index.html and add it to the client/assets directory. Configured server.js to serve the compiled html instead of index.jade for root. Removed the application controller. Locomotive is only used for the api endpoints. Gruntfile cleanup to remove duplication.
Merge branch 'lab-2-angular' into lab-2-angular-solved

* lab-2-angular:
  This closes #3 by adding the configuration to avoid permission failures.
  Added a jade task to compile index.html and add it to the client/assets directory. Configured server.js to serve the compiled html instead of index.jade for root. Removed the application controller. Locomotive is only used for the api endpoints. Gruntfile cleanup to remove duplication.
Merge branch 'lab-2-angular-solved' into lab-3-karma

* lab-2-angular-solved:
  This closes #3 by adding the configuration to avoid permission failures.
  Added a jade task to compile index.html and add it to the client/assets directory. Configured server.js to serve the compiled html instead of index.jade for root. Removed the application controller. Locomotive is only used for the api endpoints. Gruntfile cleanup to remove duplication.

Conflicts:
	Gruntfile.js