BOOM
Merge branch 'master' of https://github.com/darbs/cs439

Conflicts:
	src/threads/thread.c