last
Merge branch 'master' of https://github.com/Roborovskis/pika-deploy

Conflicts:
	server/app.js
	server/node_modules/connect/node_modules/debug/package.json
	server/package.json