commit to pull
Merge branch 'master' of https://github.com/adamgedney/FinalThinkQuickMobile
fixed timer