init first
Merge branch 'master' of github.com:dby/timeline