Initial commit
Merge branch 'gh-pages'
fix a timer bug
Merge branch 'gh-pages'