stuff
Merge branch 'master' of https://github.com/asaini2010/parallel

Conflicts:
	ompsmooth.c