started with png
Updated to Dropbox version
Merge branch 'master' of github.com:takumif/vivillon

Conflicts:
	app/routes.js
	node_modules/.bin/jade
	node_modules/jade/node_modules/constantinople/node_modules/.bin/uglifyjs
	node_modules/jade/node_modules/transformers/node_modules/.bin/uglifyjs
	node_modules/jade/node_modules/with/node_modules/.bin/uglifyjs
	server.js