progess so far towards having moving names under sprites
Merge branch 'master' into sprite-names

Conflicts:
	src/object.hpp
fixing type casting issues
Merge branch 'master' of github.com:heidi-ann/zygote