Added Sprite class
Merged changes
Complete merge
Deleted until it is actually implemented
Now using standard C++ timing