update 2
a

Conflicts:
	src/object.js