trying to get timekeeper to work
generate intervals
generate
fixed conflicts
Merge branch 's1anden-master'