key press
merge with master
Merge pull request #5 from duanw/master

it stops and starts
don;t know what this is
 deleted merge problem
trying to get timekeeper to work
generate intervals
generate
popup window
Merge pull request #7 from lisaj0323/master

popup window
fixed conflicts
Merge branch 's1anden-master'