Everything should be OK except for the threading; being fixed now
Merge branch 'master' of https://github.com/mjt5v/ComputerArchitectureClassProject