key press
merge with master
don;t know what this is
 deleted merge problem
popup window
Merge pull request #7 from lisaj0323/master

popup window
fixed conflicts
Merge branch 's1anden-master'
message responsive to video repeat
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