trying to get timekeeper to work
generate intervals
generate
Merge pull request #7 from lisaj0323/master

popup window
fixed conflicts
Merge branch 's1anden-master'
can reset intervals now
Merge pull request #9 from duanw/master

can reset intervals now
commit
fixed conflicts
Merge branch 'lisaj0323-master'
Merge branch 'master' of https://github.com/475Team/hackathon
Tried to fix interval calls
IT WORKS FOR REAL
some minor css changes