modified:   index.html
	modified:   js/newEmployee.js
	new file:   node_modules/formidable/.npmignore
Merge branch 'express' of https://github.com/glebovilya/CBoard into express

Conflicts:
	index.html
	js/newEmployee.js
	node_modules/fs.extra/node_modules/mkdirp/test/chmod.js
	node_modules/fs.extra/node_modules/mkdirp/test/clobber.js
	node_modules/fs.extra/node_modules/mkdirp/test/mkdirp.js
	node_modules/fs.extra/node_modules/mkdirp/test/perm.js
	node_modules/fs.extra/node_modules/mkdirp/test/perm_sync.js
	node_modules/fs.extra/node_modules/mkdirp/test/race.js
	node_modules/fs.extra/node_modules/mkdirp/test/rel.js
	node_modules/fs.extra/node_modules/mkdirp/test/return.js
	node_modules/fs.extra/node_modules/mkdirp/test/return_sync.js
	node_modules/fs.extra/node_modules/mkdirp/test/root.js
	node_modules/fs.extra/node_modules/mkdirp/test/sync.js
	node_modules/fs.extra/node_modules/mkdirp/test/umask.js
	node_modules/fs.extra/node_modules/mkdirp/test/umask_sync.js
	deleted:    node_modules/fs.extra/package.json
	new file:   img/Persons/skubz0pu045.jpg
	new file:   img/Persons/xavsabd01images.jpg
	new file:   node_modules/formidable/package.json~HEAD
	new file:   node_modules/fs.extra/node_modules/fs-extra/LICENSE~HEAD
	new file:   node_modules/fs.extra/node_modules/fs-extra/node_modules/jsonfile/package.json~HEAD
	modified:   public/javascripts/requier/newEmployee.js
Merge branch 'express' of https://github.com/glebovilya/CBoard into express
Merge branch 'express' of https://github.com/glebovilya/CBoard into express

Conflicts:
	public/javascripts/requier/newEmployee.js
	views/index.ejs

	modified:   .gitignore
	modified:   app.js
	modified:   public/javascripts/requier/Classes/Person.js
	modified:   public/javascripts/requier/newEmployee.js
	modified:   public/javascripts/require-jquery.js
	modified:   public/stylesheets/styleForTemplates.css
conflict

:
	deleted:    img/Persons/skubz0pu045.jpg
	deleted:    img/Persons/xavsabd01images.jpg
	deleted:    js/newEmployee.js
added data
	modified:   public/javascripts/requier/Classes/Person.js
person
Merge branch 'express' of https://github.com/glebovilya/CBoard into express
accord