new file:   css/styleForIndex.css
	renamed:    js/main.js.orig -> js/main.js
	modified:   js/newEmployee.js
test
	modified:   js/Classes/Person.js
Merge branch 'develop' of https://github.com/glebovilya/CBoard into develop
creating a home copy
	modified:   js/newEmployee.js
	modified:   js/addEmployee.js
	modified:   js/newEmployee.js
	new file:   js/stepa.js
	modified:   js/newEmployee.js
Merge branch 'iss20' of https://github.com/glebovilya/CBoard into iss20

Conflicts:
	js/newEmployee.js

	modified:   backend.html
	modified:   css/styleForIndex.css
	modified:   js/Bogush.js
	modified:   js/Classes/Person.js
	modified:   js/Classes/Project.js
	modified:   js/Classes/Widget.js
	modified:   js/addEmployee.js
	modified:   js/main.js
	deleted:    js/newEmployee.js
	new file:   js/stepa.js
	renamed:    js/requirejs_text.js -> js/text.js
	modified:   js/vlad.js
	modified:   server/controllers/dbController.js
	modified:   server/controllers/queryController.js
	modified:   server/db/dataGetter.js
	modified:   server/router.js
	new file:   js/newEmployee.js
Merge branch 'develop' of https://github.com/glebovilya/CBoard into iss20
Merge branch 'develop' of https://github.com/glebovilya/CBoard into develop

Conflicts:
	js/main.js