git init
Merge branch 'master' of github.com:shemul/tictoc