Merge pull request #9 from duanw/master

can reset intervals now
Merge branch 'master' of https://github.com/475Team/hackathon
Tried to fix interval calls
changes
IT WORKS FOR REAL
fixed merge conflicts
covered for possible race condition