added individual modules from testing
Merge branch 'brokenSwitches' of github.com:swimmadude66/CS3220 into brokenSwitches