WIP sync world with our objects
Merge branch 'master' of https://github.com/alvinlao/charm

Conflicts:
	server/brain.js