Popup default
Merge branch 'master' of https://github.com/aaronkrolik/CS308FinalProject_Inputs
Refactoring. Also, curious about efficiency of new compound event design
fix conflict