corrections
okay, all right
for merge
Merge branch 'master' of git://github.com/dxs/cmps530

Conflicts:
	js/src/cmps530-threading.cpp
	js/src/jsinterp.cpp