Updated timer to be formatted for minutes/seconds
Merge branch 'master' of https://github.com/dpaghari/ProjectWarp