Merge pull request #1 from joshhuelsman/development

Initial codebase unification.
Added Sprite class
Merged changes
Complete merge
Deleted until it is actually implemented
Now using standard C++ timing
Remove Camera from Makefile
Merge branch 'master' into development
Removed Camera from Makefile.