dist17
new files
: try to resolve the conflict
Merge branch 'master' of github.com:PigeonNerd/15418_assignment3

Conflicts:
	prog1_wsp_openmp/objs/wsp.o
	prog1_wsp_openmp/objs/wsp_serial.o
	prog1_wsp_openmp/scoreboard_token
	prog1_wsp_openmp/wsp
just commit