finished
Merge origin/master

Conflicts:
	nbproject/project.properties
	nbproject/project.xml
	node_modules/express/node_modules/accepts/node_modules/mime/package.json
	node_modules/express/node_modules/accepts/node_modules/negotiator/package.json
	node_modules/express/node_modules/accepts/package.json
	node_modules/express/node_modules/buffer-crc32/package.json
	node_modules/express/node_modules/cookie-signature/package.json
	node_modules/express/node_modules/cookie/package.json
	node_modules/express/node_modules/debug/package.json
	node_modules/express/node_modules/fresh/package.json
	node_modules/express/node_modules/merge-descriptors/package.json
	node_modules/express/node_modules/methods/package.json
	node_modules/express/node_modules/parseurl/package.json
	node_modules/express/node_modules/path-to-regexp/package.json
	node_modules/express/node_modules/qs/package.json
	node_modules/express/node_modules/range-parser/package.json
	node_modules/express/node_modules/send/node_modules/mime/package.json
	node_modules/express/node_modules/send/package.json
	node_modules/express/node_modules/serve-static/node_modules/send/node_modules/mime/package.json
	node_modules/express/node_modules/serve-static/package.json
	node_modules/express/node_modules/type-is/package.json
	node_modules/express/node_modules/utils-merge/package.json
	node_modules/express/package.json
	package.json
	server.js