main js
Merge branch 'develop' of https://github.com/glebovilya/CBoard into issue3
scroll
scroll
	modified:   css/styleForTemplates.css
	modified:   js/confirmDate.js
	modified:   js/stepa.js
Merge branch 'develop' of https://github.com/glebovilya/CBoard into develop
scroll
	modified:   js/addEmployee.js
	modified:   js/stepa.js
Merge branch 'develop' of https://github.com/glebovilya/CBoard into develop
Merge branch 'develop' of https://github.com/glebovilya/CBoard into develop
SCROLL
conflict
Merge branch 'develop' of https://github.com/glebovilya/CBoard into develop
	new file:   img/Persons/10Koala.jpg
	new file:   img/Persons/11Chrysanthemum.jpg
	new file:   img/Persons/12Tulips.jpg
	new file:   img/Persons/13Koala.jpg
	new file:   img/Persons/14
	new file:   img/Persons/15
	modified:   js/addEmployee.js
	modified:   templates/addEmployee.html
scroll
scroll
modified employee
scroll
scroll