pull
fix merge conflict
add new timer, now pull
Merge branch 'master' of https://github.com/xiaoj/461
add timer