tidying up from new sprite class
Merge branch 'master' of github.com:heidi-ann/zygote

Conflicts:
	src/map_object.hpp