refactored everything
Merge branch 'develop'

Conflicts:
	README.md
	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/formidable/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/node_modules/uid2/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/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/package.json