Threads added for testing
Merge branch 'master' of https://github.com/TLadd/SeniorDesign