fixed some bugs with the editor, made the font look better, fixed issues with progress bar not stopping, made time display work
fixed merge conflicts
merged
Merge pull request #32 from dhouk24/playback_bugfixing

TRUSTMERGE