nothing
nothing
employee
conflict
employee ajax
newEmployee.js
coflict
	new file:   img/45.jpg
	new file:   img/images.jpg
	new file:   "img/\320\267\320\260\320\263\321\200\321\203\320\266\320\265\320\275\320\275\320\276\320\265.jpg"
	modified:   js/newEmployee.js
Merge branch 'develop' of https://github.com/glebovilya/CBoard into develop
Merge branch 'iss19' into develop

Conflicts:
	js/main.js
	js/popoverForEmployee.js
	server/router.js