idea
Merge branch 'gh-pages'
Clock fixed