fixes for the merge
rescale things so enemies and elephant are two tiles high; camera panning
commit raw images