Object not edited, just saved.
Merge branch 'master' of https://github.com/dgoldberg92/tray-racer

Conflicts:
	world/object.cpp