timer formatting
Merge pull request #2 from NickMcCall/master

timer formatting