two forms
Merge branch 'gh-pages' of github.com:tfrce/stopwatchingus into gh-pages