interrupts are (weirdly) working
fix merge
Merge pull request #5 from jimmyhlee94/kaitlyn_branch

Kaitlyn branch