init
rename
addimg
static
Merge branch 'master' of heroku.com:thisispete

Conflicts:
	node_modules/express/.travis.yml
	node_modules/express/History.md
	node_modules/express/Makefile
	node_modules/express/Readme.md
	node_modules/express/bin/express
	node_modules/express/lib/application.js
	node_modules/express/lib/express.js
	node_modules/express/lib/middleware.js
	node_modules/express/lib/request.js
	node_modules/express/lib/response.js
	node_modules/express/lib/router/index.js
	node_modules/express/lib/utils.js
	node_modules/express/lib/view.js
	node_modules/express/node_modules/buffer-crc32/README.md
	node_modules/express/node_modules/buffer-crc32/index.js
	node_modules/express/node_modules/buffer-crc32/package.json
	node_modules/express/node_modules/buffer-crc32/tests/crc.test.js
	node_modules/express/node_modules/commander/package.json
	node_modules/express/node_modules/connect/.travis.yml
	node_modules/express/node_modules/connect/lib/connect.js
	node_modules/express/node_modules/connect/lib/middleware/compress.js
	node_modules/express/node_modules/connect/lib/middleware/cookieSession.js
	node_modules/express/node_modules/connect/lib/middleware/favicon.js
	node_modules/express/node_modules/connect/lib/middleware/json.js
	node_modules/express/node_modules/connect/lib/middleware/limit.js
	node_modules/express/node_modules/connect/lib/middleware/session.js
	node_modules/express/node_modules/connect/lib/middleware/session/cookie.js
	node_modules/express/node_modules/connect/lib/middleware/static.js
	node_modules/express/node_modules/connect/lib/middleware/timeout.js
	node_modules/express/node_modules/connect/lib/middleware/vhost.js
	node_modules/express/node_modules/connect/lib/public/directory.html
	node_modules/express/node_modules/connect/lib/public/error.html
	node_modules/express/node_modules/connect/lib/utils.js
	node_modules/express/node_modules/connect/node_modules/bytes/History.md
	node_modules/express/node_modules/connect/node_modules/bytes/index.js
	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/package.json
	node_modules/express/node_modules/connect/test.js
	node_modules/express/node_modules/cookie-signature/index.js
	node_modules/express/node_modules/cookie-signature/package.json
	node_modules/express/node_modules/cookie/package.json
	node_modules/express/node_modules/debug/History.md
	node_modules/express/node_modules/debug/Readme.md
	node_modules/express/node_modules/debug/debug.js
	node_modules/express/node_modules/debug/index.js
	node_modules/express/node_modules/debug/lib/debug.js
	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/.travis.yml
	node_modules/express/node_modules/mkdirp/README.markdown
	node_modules/express/node_modules/mkdirp/index.js
	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/express/test.js
	package.json
	web.js
reinstall node_modules
0.0.7