added stuff
Merge branch 'inherit' of github.com:despondentdonkey/bpm into inherit

Conflicts:
	src/objects.js