Updated openMP
fixed conflict

Conflicts:
	simplyParallel.cpp