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

Conflicts:
	public/javascripts/main.js
	modified:   public/javascripts/requier/modaladdEmployee.js
	deleted:    public/javascripts/requier/InitAccordionOnPage.js
Merge branch 'express' of https://github.com/glebovilya/CBoard into express