starting merge
Updated all but proj.cpp
merged
Merge pull request #5 from camdonite/merge

Merge
removed tinydir - Copy.h
added frame time functionality
changed the way text renders
Merge pull request #4 from camdonite/chase

Chase 12/7