Buttons handle events themselves, no longer loop thru all
Merge branch 'master' of https://github.com/ZacMcClain/FinalProject