fixing jade task to create correct links to script files
Merge branch 'lab-2-angular' into lab-2-angular-solved

* lab-2-angular:
  fixing jade task to create correct links to script files
now it's fixed
fixing paths
Merge branch 'lab-2-angular' into lab-2-angular-solved

* lab-2-angular:
  now it's fixed
Merge branch 'lab-2-angular-solved' into lab-3-karma

* lab-2-angular-solved:
  now it's fixed
  fixing jade task to create correct links to script files

Conflicts:
	client/assets/html/index.html
Merge branch 'lab-3-karma' into lab-3-karma-solved

* lab-3-karma:
  fixing paths
  now it's fixed
  fixing jade task to create correct links to script files
Merge branch 'lab-3-karma-solved' into lab-4-modules

* lab-3-karma-solved:
  fixing paths
  now it's fixed
  fixing jade task to create correct links to script files

Conflicts:
	client/assets/html/index.html