namespace collision fix
Merge branch 'master' of https://github.com/kawakita/parallel

merged

Conflicts:
	lab3/slave.c