Move time indicator text into progress bar (which is solid now)
Fix conflicts
Merge pull request #17 from pantlesswonder/master

Move time indicator text into progress bar (which is solid now)