timer
Merge branch 'gh-pages' of https://github.com/xzh-loop/Manji into gh-pages