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

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

Conflicts:
	public/javascripts/requier/Classes/Person.js
	public/javascripts/requier/Classes/Project.js

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