modified:   public/javascripts/requier/addEmployee.js
conflict
	modified:   public/javascripts/requier/Classes/Person.js
modified:   public/javascripts/requier/addEmployee.js
	modified:   public/javascripts/requier/confirmDate.js
	modified:   public/javascripts/requier/newEmployee.js
	modified:   public/javascripts/requier/stepa.js
	modified:   public/javascripts/requier/templates/addEmployee.html
	modified:   public/javascripts/requier/templates/addEmployee.html
	modified:   public/javascripts/requier/addEmployee.js
Merge branch 'express' of https://github.com/glebovilya/CBoard into express