delete module
delete module
Resolve conflict

Conflicts:
	node_modules/debug/package.json
	node_modules/express/.npmignore
	node_modules/express/History.md
	node_modules/express/Readme.md
	node_modules/express/lib/application.js
	node_modules/express/lib/express.js
	node_modules/express/lib/request.js
	node_modules/express/lib/response.js
	node_modules/express/lib/utils.js
	node_modules/express/node_modules/commander/package.json
	node_modules/express/node_modules/connect/.npmignore
	node_modules/express/node_modules/connect/Readme.md
	node_modules/express/node_modules/connect/index.js
	node_modules/express/node_modules/connect/lib/middleware/favicon.js
	node_modules/express/node_modules/connect/lib/patch.js
	node_modules/express/node_modules/connect/lib/proto.js
	node_modules/express/node_modules/connect/lib/public/favicon.ico

node_modules/express/node_modules/connect/node_modules/basic-auth-connec
t/package.json
	node_modules/express/node_modules/connect/node_modules/bytes/History.md
	node_modules/express/node_modules/connect/node_modules/bytes/Readme.md
	node_modules/express/node_modules/connect/node_modules/bytes/index.js

node_modules/express/node_modules/connect/node_modules/bytes/package.jso
n

node_modules/express/node_modules/connect/node_modules/compression/.trav
is.yml

node_modules/express/node_modules/connect/node_modules/compression/READM
E.md

node_modules/express/node_modules/connect/node_modules/compression/index
.js

node_modules/express/node_modules/connect/node_modules/compression/node_
modules/compressible/.npmignore

node_modules/express/node_modules/connect/node_modules/compression/node_
modules/compressible/index.js

node_modules/express/node_modules/connect/node_modules/compression/node_
modules/compressible/package.json

node_modules/express/node_modules/connect/node_modules/compression/node_
modules/negotiator/.npmignore

node_modules/express/node_modules/connect/node_modules/compression/node_
modules/negotiator/lib/charset.js

node_modules/express/node_modules/connect/node_modules/compression/node_
modules/negotiator/lib/encoding.js

node_modules/express/node_modules/connect/node_modules/compression/node_
modules/negotiator/lib/language.js

node_modules/express/node_modules/connect/node_modules/compression/node_
modules/negotiator/lib/mediaType.js

node_modules/express/node_modules/connect/node_modules/compression/node_
modules/negotiator/lib/negotiator.js

node_modules/express/node_modules/connect/node_modules/compression/node_
modules/negotiator/package.json

node_modules/express/node_modules/connect/node_modules/compression/node_
modules/negotiator/readme.md

node_modules/express/node_modules/connect/node_modules/compression/packa
ge.json

node_modules/express/node_modules/connect/node_modules/connect-timeout/.
npmignore

node_modules/express/node_modules/connect/node_modules/connect-timeout/R
EADME.md

node_modules/express/node_modules/connect/node_modules/connect-timeout/i
ndex.js

node_modules/express/node_modules/connect/node_modules/connect-timeout/p
ackage.json

node_modules/express/node_modules/connect/node_modules/cookie-parser/pac
kage.json
	node_modules/express/node_modules/connect/node_modules/csurf/LICENSE
	node_modules/express/node_modules/connect/node_modules/csurf/index.js

node_modules/express/node_modules/connect/node_modules/csurf/node_module
s/scmp/.npmignore

node_modules/express/node_modules/connect/node_modules/csurf/node_module
s/scmp/.travis.yml

node_modules/express/node_modules/connect/node_modules/csurf/node_module
s/uid2/package.json

node_modules/express/node_modules/connect/node_modules/csurf/package.jso
n

node_modules/express/node_modules/connect/node_modules/errorhandler/.npm
ignore

node_modules/express/node_modules/connect/node_modules/errorhandler/READ
ME.md

node_modules/express/node_modules/connect/node_modules/errorhandler/inde
x.js

node_modules/express/node_modules/connect/node_modules/errorhandler/pack
age.json

node_modules/express/node_modules/connect/node_modules/errorhandler/publ
ic/style.css

node_modules/express/node_modules/connect/node_modules/express-session/.
npmignore

node_modules/express/node_modules/connect/node_modules/express-session/L
ICENSE

node_modules/express/node_modules/connect/node_modules/express-session/R
EADME.md

node_modules/express/node_modules/connect/node_modules/express-session/i
ndex.js

node_modules/express/node_modules/connect/node_modules/express-session/n
ode_modules/uid2/package.json

node_modules/express/node_modules/connect/node_modules/express-session/n
ode_modules/utils-merge/package.json

node_modules/express/node_modules/connect/node_modules/express-session/p
ackage.json

node_modules/express/node_modules/connect/node_modules/express-session/s
ession/memory.js

node_modules/express/node_modules/connect/node_modules/method-override/p
ackage.json

node_modules/express/node_modules/connect/node_modules/morgan/.npmignore
	node_modules/express/node_modules/connect/node_modules/morgan/README.md
	node_modules/express/node_modules/connect/node_modules/morgan/index.js

node_modules/express/node_modules/connect/node_modules/morgan/package.js
on

node_modules/express/node_modules/connect/node_modules/multiparty/node_m
odules/readable-stream/node_modules/inherits/package.json

node_modules/express/node_modules/connect/node_modules/multiparty/node_m
odules/readable-stream/package.json

node_modules/express/node_modules/connect/node_modules/raw-body/README.m
d

node_modules/express/node_modules/connect/node_modules/raw-body/index.js

node_modules/express/node_modules/connect/node_modules/raw-body/package.
json

node_modules/express/node_modules/connect/node_modules/response-time/pac
kage.json

node_modules/express/node_modules/connect/node_modules/serve-favicon/LIC
ENSE

node_modules/express/node_modules/connect/node_modules/serve-index/.trav
is.yml

node_modules/express/node_modules/connect/node_modules/serve-index/Readm
e.md

node_modules/express/node_modules/connect/node_modules/serve-index/index
.js

node_modules/express/node_modules/connect/node_modules/serve-index/node_
modules/negotiator/.npmignore

node_modules/express/node_modules/connect/node_modules/serve-index/node_
modules/negotiator/lib/mediaType.js

node_modules/express/node_modules/connect/node_modules/serve-index/node_
modules/negotiator/package.json

node_modules/express/node_modules/connect/node_modules/serve-index/packa
ge.json

node_modules/express/node_modules/connect/node_modules/serve-static/.tra
vis.yml

node_modules/express/node_modules/connect/node_modules/serve-static/Read
me.md

node_modules/express/node_modules/connect/node_modules/serve-static/inde
x.js

node_modules/express/node_modules/connect/node_modules/serve-static/node
_modules/parseurl/.npmignore

node_modules/express/node_modules/connect/node_modules/serve-static/node
_modules/parseurl/README.md

node_modules/express/node_modules/connect/node_modules/serve-static/pack
age.json

node_modules/express/node_modules/connect/node_modules/vhost/package.jso
n
	node_modules/express/node_modules/connect/package.json
	node_modules/express/node_modules/cookie-signature/package.json
	node_modules/express/node_modules/cookie/.npmignore
	node_modules/express/node_modules/cookie/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/History.md
	node_modules/express/node_modules/methods/LICENSE
	node_modules/express/node_modules/methods/index.js
	node_modules/express/node_modules/methods/package.json
	node_modules/express/node_modules/mkdirp/.travis.yml
	node_modules/express/node_modules/mkdirp/index.js

node_modules/express/node_modules/mkdirp/node_modules/minimist/.travis.y
ml
	node_modules/express/node_modules/mkdirp/package.json
	node_modules/express/node_modules/mkdirp/readme.markdown
	node_modules/express/node_modules/mkdirp/test/mkdirp.js
	node_modules/express/node_modules/mkdirp/test/perm.js
	node_modules/express/node_modules/mkdirp/test/perm_sync.js
	node_modules/express/node_modules/mkdirp/test/race.js
	node_modules/express/node_modules/mkdirp/test/rel.js
	node_modules/express/node_modules/mkdirp/test/sync.js
	node_modules/express/node_modules/mkdirp/test/umask.js
	node_modules/express/node_modules/mkdirp/test/umask_sync.js
	node_modules/express/node_modules/range-parser/package.json
	node_modules/express/node_modules/send/.npmignore
	node_modules/express/node_modules/send/History.md
	node_modules/express/node_modules/send/Readme.md
	node_modules/express/node_modules/send/lib/send.js
	node_modules/express/node_modules/send/lib/utils.js
	node_modules/express/node_modules/send/node_modules/debug/Readme.md
	node_modules/express/node_modules/send/node_modules/debug/debug.js
	node_modules/express/node_modules/send/node_modules/debug/lib/debug.js
	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/History.md
	node_modules/mongoose/lib/aggregate.js
	node_modules/mongoose/lib/document.js
	node_modules/mongoose/lib/drivers/node-mongodb-native/collection.js
	node_modules/mongoose/lib/query.js
	node_modules/mongoose/node_modules/mongodb/.travis.yml
	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/aggregation_curso
r.js

node_modules/mongoose/node_modules/mongodb/lib/mongodb/auth/mongodb_cr.j
s
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/collection.js

node_modules/mongoose/node_modules/mongodb/lib/mongodb/collection/aggreg
ation.js

node_modules/mongoose/node_modules/mongodb/lib/mongodb/collection/comman
ds.js

node_modules/mongoose/node_modules/mongodb/lib/mongodb/collection/core.j
s

node_modules/mongoose/node_modules/mongodb/lib/mongodb/collection/geo.js

node_modules/mongoose/node_modules/mongodb/lib/mongodb/collection/query.
js

node_modules/mongoose/node_modules/mongodb/lib/mongodb/command_cursor.js

node_modules/mongoose/node_modules/mongodb/lib/mongodb/commands/db_comma
nd.js

node_modules/mongoose/node_modules/mongodb/lib/mongodb/commands/query_co
mmand.js

node_modules/mongoose/node_modules/mongodb/lib/mongodb/connection/base.j
s

node_modules/mongoose/node_modules/mongodb/lib/mongodb/connection/connec
tion.js

node_modules/mongoose/node_modules/mongodb/lib/mongodb/connection/connec
tion_pool.js

node_modules/mongoose/node_modules/mongodb/lib/mongodb/connection/mongos
.js

node_modules/mongoose/node_modules/mongodb/lib/mongodb/connection/read_p
reference.js

node_modules/mongoose/node_modules/mongodb/lib/mongodb/connection/repl_s
et/ha.js

node_modules/mongoose/node_modules/mongodb/lib/mongodb/connection/repl_s
et/options.js

node_modules/mongoose/node_modules/mongodb/lib/mongodb/connection/repl_s
et/repl_set.js

node_modules/mongoose/node_modules/mongodb/lib/mongodb/connection/repl_s
et/strategies/ping_strategy.js

node_modules/mongoose/node_modules/mongodb/lib/mongodb/connection/repl_s
et/strategies/statistics_strategy.js

node_modules/mongoose/node_modules/mongodb/lib/mongodb/connection/server
.js

node_modules/mongoose/node_modules/mongodb/lib/mongodb/connection/server
_capabilities.js

node_modules/mongoose/node_modules/mongodb/lib/mongodb/connection/url_pa
rser.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/chunk.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/index.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/mongo_client.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/scope.js
	node_modules/mongoose/node_modules/mongodb/lib/mongodb/utils.js

node_modules/mongoose/node_modules/mongodb/node_modules/bson/binding.gyp

node_modules/mongoose/node_modules/mongodb/node_modules/bson/build/Relea
se/.deps/Release/obj.target/bson/ext/bson.o.d

node_modules/mongoose/node_modules/mongodb/node_modules/bson/build/Relea
se/bson.node

node_modules/mongoose/node_modules/mongodb/node_modules/bson/build/Relea
se/obj.target/bson/ext/bson.o

node_modules/mongoose/node_modules/mongodb/node_modules/bson/build/bson.
target.mk

node_modules/mongoose/node_modules/mongodb/node_modules/bson/build/confi
g.gypi

node_modules/mongoose/node_modules/mongodb/node_modules/bson/ext/bson.cc

node_modules/mongoose/node_modules/mongodb/node_modules/bson/ext/index.j
s

node_modules/mongoose/node_modules/mongodb/node_modules/bson/lib/bson/bi
nary.js

node_modules/mongoose/node_modules/mongodb/node_modules/bson/lib/bson/bs
on.js

node_modules/mongoose/node_modules/mongodb/node_modules/bson/lib/bson/ob
jectid.js

node_modules/mongoose/node_modules/mongodb/node_modules/bson/node_module
s/nan/LICENSE

node_modules/mongoose/node_modules/mongodb/node_modules/bson/node_module
s/nan/README.md

node_modules/mongoose/node_modules/mongodb/node_modules/bson/node_module
s/nan/nan.h

node_modules/mongoose/node_modules/mongodb/node_modules/bson/package.jso
n

node_modules/mongoose/node_modules/mongodb/node_modules/kerberos/build/R
elease/kerberos.node

node_modules/mongoose/node_modules/mongodb/node_modules/kerberos/build/c
onfig.gypi

node_modules/mongoose/node_modules/mongodb/node_modules/kerberos/package
.json
	node_modules/mongoose/node_modules/mongodb/package.json
	node_modules/mongoose/node_modules/mquery/History.md
	node_modules/mongoose/node_modules/mquery/lib/mquery.js
	node_modules/mongoose/node_modules/mquery/lib/utils.js

node_modules/mongoose/node_modules/mquery/node_modules/debug/package.jso
n
	node_modules/mongoose/node_modules/mquery/package.json
	node_modules/mongoose/node_modules/mquery/test/index.js
	node_modules/mongoose/node_modules/mquery/test/utils.test.js
	node_modules/mongoose/node_modules/sliced/package.json
	node_modules/mongoose/package.json
	package.json
app