resolved conflict in Sprite.h
Merge branch 'master' of https://github.com/cLoopRo/XNDON