merging
Merge remote-tracking branch 'origin/master'

Conflicts:
	node_modules/.bin/jade
	node_modules/body-parser/node_modules/qs/package.json
	node_modules/body-parser/node_modules/raw-body/node_modules/bytes/package.json
	node_modules/body-parser/node_modules/raw-body/node_modules/string_decoder/package.json
	node_modules/body-parser/node_modules/raw-body/package.json
	node_modules/body-parser/node_modules/type-is/node_modules/mime/package.json
	node_modules/body-parser/node_modules/type-is/package.json
	node_modules/body-parser/package.json
	node_modules/cookie-parser/node_modules/cookie-signature/package.json
	node_modules/cookie-parser/node_modules/cookie/package.json
	node_modules/cookie-parser/package.json
	node_modules/debug/package.json
	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/escape-html/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/debug/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/package.json
	node_modules/express/node_modules/type-is/node_modules/mime/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
	node_modules/jade/bin/jade.js
	node_modules/jade/node_modules/character-parser/package.json
	node_modules/jade/node_modules/commander/package.json
	node_modules/jade/node_modules/constantinople/node_modules/.bin/uglifyjs
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/bin/uglifyjs
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/node_modules/async/lib/async.js
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/node_modules/async/package.json
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/package.json
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/node_modules/optimist/package.json
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/node_modules/optimist/test/_/bin.js
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/node_modules/source-map/node_modules/amdefine/package.json
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/node_modules/source-map/package.json
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/node_modules/source-map/test/run-tests.js
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/node_modules/uglify-to-browserify/package.json
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/package.json
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/test/run-tests.js
	node_modules/jade/node_modules/constantinople/package.json
	node_modules/jade/node_modules/mkdirp/package.json
	node_modules/jade/node_modules/monocle/node_modules/readdirp/examples/node_modules/event-stream/node_modules/optimist/test/_/bin.js
	node_modules/jade/node_modules/monocle/node_modules/readdirp/node_modules/minimatch/node_modules/lru-cache/package.json
	node_modules/jade/node_modules/monocle/node_modules/readdirp/node_modules/minimatch/node_modules/sigmund/package.json
	node_modules/jade/node_modules/monocle/node_modules/readdirp/node_modules/minimatch/package.json
	node_modules/jade/node_modules/monocle/node_modules/readdirp/package.json
	node_modules/jade/node_modules/monocle/package.json
	node_modules/jade/node_modules/transformers/node_modules/.bin/uglifyjs
	node_modules/jade/node_modules/transformers/node_modules/css/node_modules/css-parse/package.json
	node_modules/jade/node_modules/transformers/node_modules/css/node_modules/css-stringify/package.json
	node_modules/jade/node_modules/transformers/node_modules/css/package.json
	node_modules/jade/node_modules/transformers/node_modules/promise/node_modules/is-promise/package.json
	node_modules/jade/node_modules/transformers/node_modules/promise/package.json
	node_modules/jade/node_modules/transformers/node_modules/uglify-js/bin/uglifyjs
	node_modules/jade/node_modules/transformers/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/package.json
	node_modules/jade/node_modules/transformers/node_modules/uglify-js/node_modules/optimist/package.json
	node_modules/jade/node_modules/transformers/node_modules/uglify-js/node_modules/optimist/test/_/bin.js
	node_modules/jade/node_modules/transformers/node_modules/uglify-js/node_modules/source-map/node_modules/amdefine/package.json
	node_modules/jade/node_modules/transformers/node_modules/uglify-js/node_modules/source-map/package.json
	node_modules/jade/node_modules/transformers/node_modules/uglify-js/node_modules/source-map/test/run-tests.js
	node_modules/jade/node_modules/transformers/node_modules/uglify-js/package.json
	node_modules/jade/node_modules/transformers/node_modules/uglify-js/test/run-tests.js
	node_modules/jade/node_modules/transformers/package.json
	node_modules/jade/node_modules/with/node_modules/.bin/uglifyjs
	node_modules/jade/node_modules/with/node_modules/uglify-js/bin/uglifyjs
	node_modules/jade/node_modules/with/node_modules/uglify-js/node_modules/async/lib/async.js
	node_modules/jade/node_modules/with/node_modules/uglify-js/node_modules/async/package.json
	node_modules/jade/node_modules/with/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/package.json
	node_modules/jade/node_modules/with/node_modules/uglify-js/node_modules/optimist/package.json
	node_modules/jade/node_modules/with/node_modules/uglify-js/node_modules/optimist/test/_/bin.js
	node_modules/jade/node_modules/with/node_modules/uglify-js/node_modules/source-map/node_modules/amdefine/package.json
	node_modules/jade/node_modules/with/node_modules/uglify-js/node_modules/source-map/package.json
	node_modules/jade/node_modules/with/node_modules/uglify-js/node_modules/source-map/test/run-tests.js
	node_modules/jade/node_modules/with/node_modules/uglify-js/node_modules/uglify-to-browserify/package.json
	node_modules/jade/node_modules/with/node_modules/uglify-js/package.json
	node_modules/jade/node_modules/with/node_modules/uglify-js/test/run-tests.js
	node_modules/jade/node_modules/with/package.json
	node_modules/jade/package.json
	node_modules/morgan/node_modules/bytes/package.json
	node_modules/morgan/package.json
	node_modules/static-favicon/package.json