Created the Sprite, set texture, addded physics etc.
Created the Sprite, set texture, addded physics, resolved merge conflicts