Threading isssue fix attempt 2
Merge branch 'master' of https://github.com/kcsmith4/CSE445_Assignment2