Merge branch 'master' of https://github.com/Rbdall/Operating-Systems
Things work
pthreads works for at least 1 test case
pthreads probably works
Merge branch 'master' of http://github.com/dlpeatman/Operating-Systems
Bookeeping changes