packery & search & spaceholder & stuff
Merge branch 'master' of github.com:r4vi/spacehack

Conflicts:
	server/server.js