dps
blubMerge branch 'master' of github.com:thomas42/paraprog

Conflicts:
	openMP/algo1/makefile