Added overlays and underlays for sprites
Adding overlays and underlays!
Merging in and fixing conflicts
Merge branch 'master' of https://github.com/heidi-ann/zygote