minor changes
Merge branch 'master' of https://github.com/kawakita/parallel
testing

Conflicts:
	lab3/supervisor.c