Merge branch 'master', remote branch 'origin'
Modified next_thread_to_run
Merge branch 'master' of https://github.com/dcastil1983/cs153_project into David
removed test.txt