added Cody's button test
Merge branch 'buttonTest' of https://github.com/dcpounds/wpi-suite into buttonTest
Fixed merge conflicts
fixed more merge conflicts