add timer
Merge branch 'master' of github.com:guozesheng/guozesheng.github.com