correction fouille
maj packages
Merge branch 'master' of https://github.com/MainMain/Ei4_Proj3ct

Conflicts:
	node_modules/async/package.json
	node_modules/express/node_modules/buffer-crc32/package.json
	node_modules/express/node_modules/commander/package.json
	node_modules/express/node_modules/connect/node_modules/bytes/package.json
	node_modules/express/node_modules/connect/node_modules/pause/package.json
	node_modules/express/node_modules/connect/node_modules/qs/package.json
	node_modules/express/node_modules/connect/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/methods/package.json
	node_modules/express/node_modules/mkdirp/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/package.json
	node_modules/mongoose/node_modules/hooks/package.json
	node_modules/mongoose/node_modules/mongodb/.travis.yml
	node_modules/mongoose/node_modules/mongodb/CONTRIBUTING.md
	node_modules/mongoose/node_modules/mongodb/Readme.md
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/admin.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/auth/mongodb_cr.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/collection.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/commands/db_command.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/commands/delete_command.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/commands/query_command.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/connection/base.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/connection/connection.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/connection/mongos.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/connection/repl_set/ha.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/connection/repl_set/repl_set.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/connection/repl_set/repl_set_state.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/connection/repl_set/strategies/ping_strategy.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/connection/server.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/connection/url_parser.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/cursor.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/db.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/gridfs/gridstore.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/gridfs/readstream.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/mongo_client.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/utils.js
	node_modules/mongoose/node_modules/mongodb/node_modules/bson/.travis.yml
	node_modules/mongoose/node_modules/mongodb/node_modules/bson/binding.gyp
	node_modules/mongoose/node_modules/mongodb/node_modules/bson/browser_build/bson.js
	node_modules/mongoose/node_modules/mongodb/node_modules/bson/builderror.log
	node_modules/mongoose/node_modules/mongodb/node_modules/bson/ext/bson.cc
	node_modules/mongoose/node_modules/mongodb/node_modules/bson/ext/bson.h
	node_modules/mongoose/node_modules/mongodb/node_modules/bson/ext/index.js
	node_modules/mongoose/node_modules/mongodb/node_modules/bson/lib/bson/bson.js
	node_modules/mongoose/node_modules/mongodb/node_modules/bson/lib/bson/objectid.js
	node_modules/mongoose/node_modules/mongodb/node_modules/bson/package.json
	node_modules/mongoose/node_modules/mongodb/node_modules/kerberos/builderror.log
	node_modules/mongoose/node_modules/mongodb/node_modules/kerberos/package.json
	node_modules/mongoose/node_modules/mongodb/package.json
	node_modules/mongoose/node_modules/mongodb/t.js
	node_modules/mongoose/node_modules/mpath/package.json
	node_modules/mongoose/node_modules/mpromise/package.json
	node_modules/mongoose/node_modules/mquery/node_modules/debug/package.json
	node_modules/mongoose/node_modules/mquery/package.json
	node_modules/mongoose/node_modules/ms/package.json
	node_modules/mongoose/node_modules/muri/package.json
	node_modules/mongoose/node_modules/regexp-clone/package.json
	node_modules/mongoose/node_modules/sliced/package.json
	node_modules/mongoose/package.json
maj package 2 + integration police