supersync
Merge branch 'master' of https://github.com/br3nd4n/LordsOfTheHinterlands

Conflicts:
	node_modules/express/benchmarks/run
	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/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/range-parser/package.json
	node_modules/express/node_modules/send/package.json

node_modules/express/node_modules/serve-static/node_modules/send/node_mo
dules/fresh/package.json

node_modules/express/node_modules/serve-static/node_modules/send/node_mo
dules/range-parser/package.json

node_modules/express/node_modules/serve-static/node_modules/send/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
smitty3
wtf sync
Merge branch 'master' of https://github.com/br3nd4n/LordsOfTheHinterlands

errrrrging