button fixes
Merge branch 'master' of https://github.com/kevsherman/bbk_final_project