modified:   public/javascripts/requier/addEmployee.js
	modified:   public/javascripts/requier/addProject.js
Merge branch 'express' of https://github.com/glebovilya/CBoard into express

Conflicts:
	public/javascripts/requier/addProject.js
	modified:   public/javascripts/requier/addEmployee.js
	modified:   public/javascripts/requier/addProject.js
Merge branch 'express' of https://github.com/glebovilya/CBoard into express

Conflicts:
	public/javascripts/requier/addProject.js

	modified:   app.js
	modified:   public/javascripts/requier/addProject.js
	modified:   public/javascripts/requier/newEmployee.js
Merge branch 'express' of https://github.com/glebovilya/CBoard into express