Merge pull request #6 from tyler-weeres/scalable

Scalable
Added timer text
Merged with master