Almost from scratch
From scratch v2
Merge branch 'master' of heroku.com:spacecoop

Conflicts:
	server-0-5.js