bajr code
Merge branch 'master' of https://github.com/The-Duchess/CS300-BridgeControlSystem
Merge branch 'tests'